diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-10-01 12:01:14 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-01 12:01:14 +0000 |
| commit | c641792c36f83df6122172f85f0f662d86e15f60 (patch) | |
| tree | 3e2ab2f1767f5a7d8e40bb0c505f84e8f03860dc /pkgs/tools/archivers | |
| parent | 2fdbad53e52b1311beb08e14175950dcd1442af9 (diff) | |
| parent | 62ca4a425ab112e5d8a75682ee76c069cdb42d4b (diff) | |
| download | nixpkgs-c641792c36f83df6122172f85f0f662d86e15f60.tar nixpkgs-c641792c36f83df6122172f85f0f662d86e15f60.tar.gz nixpkgs-c641792c36f83df6122172f85f0f662d86e15f60.tar.bz2 nixpkgs-c641792c36f83df6122172f85f0f662d86e15f60.tar.lz nixpkgs-c641792c36f83df6122172f85f0f662d86e15f60.tar.xz nixpkgs-c641792c36f83df6122172f85f0f662d86e15f60.tar.zst nixpkgs-c641792c36f83df6122172f85f0f662d86e15f60.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/tools/archivers')
| -rw-r--r-- | pkgs/tools/archivers/unrar/default.nix | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/pkgs/tools/archivers/unrar/default.nix b/pkgs/tools/archivers/unrar/default.nix index b06242a98c0..25c8ce9b558 100644 --- a/pkgs/tools/archivers/unrar/default.nix +++ b/pkgs/tools/archivers/unrar/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "unrar"; - version = "5.9.2"; + version = "6.0.7"; src = fetchurl { url = "https://www.rarlab.com/rar/unrarsrc-${version}.tar.gz"; - sha256 = "19nsxdvf9ll99hvgzq6f89ymxhwki224lygjdabrg8ghikqvmlvk"; + sha256 = "sha256-pwKZQgBsvM7T87cyLsGXaD+Oe+QIlyyggJmxlsA49Rg="; }; postPatch = '' @@ -17,21 +17,27 @@ stdenv.mkDerivation rec { ''; buildPhase = '' + # `make {unrar,lib}` call `make clean` implicitly + # move build results to another dir to avoid deleting them + mkdir -p bin + make unrar - make clean + mv unrar bin + make lib + mv libunrar.so bin ''; outputs = [ "out" "dev" ]; installPhase = '' - install -Dt "$out/bin" unrar + install -Dt "$out/bin" bin/unrar mkdir -p $out/share/doc/unrar cp acknow.txt license.txt \ $out/share/doc/unrar - install -Dm755 libunrar.so $out/lib/libunrar.so + install -Dm755 bin/libunrar.so $out/lib/libunrar.so install -Dt $dev/include/unrar/ *.hpp ''; |