about summary refs log tree commit diff
path: root/pkgs/top-level
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2008-05-19 15:12:03 +0000
committerEelco Dolstra <eelco.dolstra@logicblox.com>2008-05-19 15:12:03 +0000
commit1d6f0ab989c2b876526450787d7ea676d07c42c9 (patch)
tree4dac403148f249d872071ddabdc03744722404d1 /pkgs/top-level
parent79ed6fcf36c4ce4d7da0eb3b7da79785c04ae4eb (diff)
downloadnixlib-1d6f0ab989c2b876526450787d7ea676d07c42c9.tar
nixlib-1d6f0ab989c2b876526450787d7ea676d07c42c9.tar.gz
nixlib-1d6f0ab989c2b876526450787d7ea676d07c42c9.tar.bz2
nixlib-1d6f0ab989c2b876526450787d7ea676d07c42c9.tar.lz
nixlib-1d6f0ab989c2b876526450787d7ea676d07c42c9.tar.xz
nixlib-1d6f0ab989c2b876526450787d7ea676d07c42c9.tar.zst
nixlib-1d6f0ab989c2b876526450787d7ea676d07c42c9.zip
* On Linux, build coreutils with ACL support.
svn path=/nixpkgs/branches/stdenv-updates/; revision=11848
Diffstat (limited to 'pkgs/top-level')
-rw-r--r--pkgs/top-level/all-packages.nix17
1 files changed, 10 insertions, 7 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3e9e2cb54d8c..cb398920d188 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -440,7 +440,8 @@ rec {
       then import ../tools/misc/coreutils-5
       else import ../tools/misc/coreutils)
     {
-      inherit fetchurl stdenv;
+      inherit fetchurl stdenv acl;
+      aclSupport = stdenv.isLinux;
     });
 
   cpio = import ../tools/archivers/cpio {
@@ -2114,9 +2115,10 @@ rec {
     inherit fetchurl stdenv ncurses;
   };
 
-  acl = import ../development/libraries/acl {
-    inherit stdenv fetchurl gettext attr libtool;
-  };
+  acl = useFromStdenv "acl"
+    (import ../development/libraries/acl {
+      inherit stdenv fetchurl gettext attr libtool;
+    });
 
   /*
   agg = import ../development/libraries/agg {
@@ -2165,9 +2167,10 @@ rec {
     inherit fetchurl stdenv;
   };
 
-  attr = import ../development/libraries/attr {
-    inherit stdenv fetchurl libtool gettext;
-  };
+  attr = useFromStdenv "acl"
+    (import ../development/libraries/attr {
+      inherit stdenv fetchurl libtool gettext;
+    });
 
   audiofile = import ../development/libraries/audiofile {
     inherit fetchurl stdenv;