dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

* On Linux, build coreutils with ACL support.

Browse Source 
svn path=/nixpkgs/branches/stdenv-updates/; revision=11848
This commit is contained in:
Eelco Dolstra 2008-05-19 15:12:03 +00:00
parent 79ed6fcf36
commit 1d6f0ab989
3 changed files with 29 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
pkgs/stdenv/linux/default.nix
View File

@ -4,7 +4,8 @@
# compiler and linker that do not search in default locations, # compiler and linker that do not search in default locations,
# ensuring purity of components produced by it. # ensuring purity of components produced by it.
{system, allPackages}: # The function defaults are for easy testing.
{system ? "i686-linux", allPackages ? import ../../top-level/all-packages.nix}:
rec { rec {
@ -98,7 +99,7 @@ rec {
# This function builds the various standard environments used during # This function builds the various standard environments used during
# the bootstrap. # the bootstrap.
stdenvBootFun = stdenvBootFun =
{gcc, staticGlibc, extraAttrs ? {}}: {gcc, staticGlibc, extraAttrs ? {}, extraPath ? []}:
import ../generic { import ../generic {
name = "stdenv-linux-boot"; name = "stdenv-linux-boot";
@ -106,9 +107,7 @@ rec {
preHook = ./scripts/prehook.sh; preHook = ./scripts/prehook.sh;
stdenv = stdenvInitial; stdenv = stdenvInitial;
shell = bootstrapTools.bash; shell = bootstrapTools.bash;
initialPath = [ initialPath = [staticTools] ++ extraPath;
staticTools
];
inherit gcc extraAttrs; inherit gcc extraAttrs;
}; };
@ -153,6 +152,14 @@ rec {
bootStdenv = stdenvLinuxBoot2; bootStdenv = stdenvLinuxBoot2;
}; };
# Ugh, some packages in stdenvLinuxBoot3Pkgs need "sh", so create a
# package that contains just a symlink to bash.
shSymlink = stdenvLinuxBoot2Pkgs.runCommand "sh-symlink" {} ''
ensureDir $out/bin
ln -s $shell $out/bin/sh
'';
# 6) Construct a third stdenv identical to the second, except that # 6) Construct a third stdenv identical to the second, except that
# this one uses the dynamically linked GCC and Binutils from step # this one uses the dynamically linked GCC and Binutils from step
@ -165,6 +172,7 @@ rec {
gcc = stdenvLinuxBoot2Pkgs.gcc.gcc; gcc = stdenvLinuxBoot2Pkgs.gcc.gcc;
}; };
extraAttrs = {inherit curl;}; extraAttrs = {inherit curl;};
extraPath = [stdenvLinuxBoot2Pkgs.replace shSymlink];
}; };
@ -178,7 +186,7 @@ rec {
# 8) Construct the final stdenv. It uses the Glibc, GCC and # 8) Construct the final stdenv. It uses the Glibc, GCC and
# Binutils built above, and adds in dynamically linked versions # Binutils built above, and adds in dynamically linked versions
# of all other tools. # of all other tools.
stdenvLinux = (import ../generic) { stdenvLinux = import ../generic {
name = "stdenv-linux"; name = "stdenv-linux";
preHook = ./scripts/prehook.sh; preHook = ./scripts/prehook.sh;
initialPath = [ initialPath = [
@ -202,7 +210,8 @@ rec {
inherit (stdenvLinuxBoot2Pkgs) binutils /* gcc */ glibc; inherit (stdenvLinuxBoot2Pkgs) binutils /* gcc */ glibc;
inherit (stdenvLinuxBoot3Pkgs) inherit (stdenvLinuxBoot3Pkgs)
gzip bzip2 bash coreutils diffutils findutils gawk gzip bzip2 bash coreutils diffutils findutils gawk
gnumake gnused gnutar gnugrep patch patchelf; gnumake gnused gnutar gnugrep patch patchelf
attr acl;
}; };
}; };

4
pkgs/tools/misc/coreutils/default.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl}: {stdenv, fetchurl, aclSupport ? false, acl}:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "coreutils-6.11"; name = "coreutils-6.11";
@ -12,4 +12,6 @@ stdenv.mkDerivation {
homepage = http://www.gnu.org/software/coreutils/; homepage = http://www.gnu.org/software/coreutils/;
description = "The basic file, shell and text manipulation utilities of the GNU operating system"; description = "The basic file, shell and text manipulation utilities of the GNU operating system";
}; };
buildInputs = stdenv.lib.optional aclSupport acl;
} }

17
pkgs/top-level/all-packages.nix
View File

@ -440,7 +440,8 @@ rec {
then import ../tools/misc/coreutils-5 then import ../tools/misc/coreutils-5
else import ../tools/misc/coreutils) else import ../tools/misc/coreutils)
{ {
inherit fetchurl stdenv; inherit fetchurl stdenv acl;
aclSupport = stdenv.isLinux;
}); });
cpio = import ../tools/archivers/cpio { cpio = import ../tools/archivers/cpio {
@ -2114,9 +2115,10 @@ rec {
inherit fetchurl stdenv ncurses; inherit fetchurl stdenv ncurses;
}; };
acl = import ../development/libraries/acl { acl = useFromStdenv "acl"
inherit stdenv fetchurl gettext attr libtool; (import ../development/libraries/acl {
}; inherit stdenv fetchurl gettext attr libtool;
});
/* /*
agg = import ../development/libraries/agg { agg = import ../development/libraries/agg {
@ -2165,9 +2167,10 @@ rec {
inherit fetchurl stdenv; inherit fetchurl stdenv;
}; };
attr = import ../development/libraries/attr { attr = useFromStdenv "acl"
inherit stdenv fetchurl libtool gettext; (import ../development/libraries/attr {
}; inherit stdenv fetchurl libtool gettext;
});
audiofile = import ../development/libraries/audiofile { audiofile = import ../development/libraries/audiofile {
inherit fetchurl stdenv; inherit fetchurl stdenv;