diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-04-13 09:25:28 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-04-13 09:25:28 +0200 |
| commit | 39ebb01d6e8d19b042fe65d303234d0db27877eb (patch) | |
| tree | 083025f5791bfce9f14e1d3f4c66035ef82ba72d /pkgs/tools/archivers | |
| parent | 81cedab4f1fe9578e004ce03de5630a25c737a9e (diff) | |
| parent | 87b49397bf1e26ac17c4a55fed41bd836fefc39d (diff) | |
| download | nixlib-39ebb01d6e8d19b042fe65d303234d0db27877eb.tar nixlib-39ebb01d6e8d19b042fe65d303234d0db27877eb.tar.gz nixlib-39ebb01d6e8d19b042fe65d303234d0db27877eb.tar.bz2 nixlib-39ebb01d6e8d19b042fe65d303234d0db27877eb.tar.lz nixlib-39ebb01d6e8d19b042fe65d303234d0db27877eb.tar.xz nixlib-39ebb01d6e8d19b042fe65d303234d0db27877eb.tar.zst nixlib-39ebb01d6e8d19b042fe65d303234d0db27877eb.zip | |
Merge branch 'staging', containing closure-size #7701
Diffstat (limited to 'pkgs/tools/archivers')
| -rw-r--r-- | pkgs/tools/archivers/gnutar/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/tools/archivers/unrar/default.nix | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/pkgs/tools/archivers/gnutar/default.nix b/pkgs/tools/archivers/gnutar/default.nix index 71b43bf2de9a..36d3ebd9816f 100644 --- a/pkgs/tools/archivers/gnutar/default.nix +++ b/pkgs/tools/archivers/gnutar/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook }: +{ stdenv, fetchurl, autoreconfHook, acl }: stdenv.mkDerivation rec { name = "gnutar-${version}"; @@ -24,7 +24,11 @@ stdenv.mkDerivation rec { substituteInPlace src/system.c --replace '_(' 'N_(' ''; - buildInputs = stdenv.lib.optional stdenv.isDarwin autoreconfHook; + outputs = [ "out" "info" ]; + + buildInputs = [ ] + ++ stdenv.lib.optional stdenv.isLinux acl + ++ stdenv.lib.optional stdenv.isDarwin autoreconfHook; # May have some issues with root compilation because the bootstrap tool # cannot be used as a login shell for now. diff --git a/pkgs/tools/archivers/unrar/default.nix b/pkgs/tools/archivers/unrar/default.nix index 768c7afd7eb7..f2fdc71dc86c 100644 --- a/pkgs/tools/archivers/unrar/default.nix +++ b/pkgs/tools/archivers/unrar/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ''; installPhase = '' - installBin unrar + install -Dt "$out/bin" unrar mkdir -p $out/share/doc/unrar cp acknow.txt license.txt \ |