diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2016-03-08 09:57:58 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2016-03-08 09:58:19 +0100 |
commit | 09af15654f0c8091f1b9e0bbb2e523cdee194442 (patch) | |
tree | e648edef1ce4c64c533f2593aa22b8015cf0e506 /pkgs/tools/archivers/unrar | |
parent | f306e67e15bdbe9a8358c9f81319fc4fcbadc2eb (diff) | |
parent | 0ee75214f336474e127c2e3546c0406a0c4d5fa7 (diff) |
Merge master into closure-size
The kde-5 stuff still didn't merge well.
I hand-fixed what I saw, but there may be more problems.
Diffstat (limited to 'pkgs/tools/archivers/unrar')
-rw-r--r-- | pkgs/tools/archivers/unrar/default.nix | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/pkgs/tools/archivers/unrar/default.nix b/pkgs/tools/archivers/unrar/default.nix index 86ad4a4c1453..769f20c41111 100644 --- a/pkgs/tools/archivers/unrar/default.nix +++ b/pkgs/tools/archivers/unrar/default.nix @@ -1,18 +1,18 @@ {stdenv, fetchurl}: -let - version = "5.3.9"; -in -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "unrar-${version}"; + version = "5.3.11"; src = fetchurl { url = "http://www.rarlab.com/rar/unrarsrc-${version}.tar.gz"; - sha256 = "0nsxwg1zp3s34wyjznwmy2cc5929yk7m5smq11cqdb6hmql3fngz"; + sha256 = "0qw77gvr57azjbn76cjlm4sv1hf2hh90g7n7n33gfvlpnbs7mf3p"; }; - preBuild = '' - export buildFlags="CXX=$CXX" + buildPhase = '' + make unrar + make clean + make lib ''; installPhase = '' @@ -21,6 +21,9 @@ stdenv.mkDerivation { mkdir -p $out/share/doc/unrar cp acknow.txt license.txt \ $out/share/doc/unrar + + install -Dm755 libunrar.so $out/lib/libunrar.so + install -D dll.hpp $out/include/unrar/dll.hpp ''; setupHook = ./setup-hook.sh; |