diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2014-08-26 00:17:03 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2014-08-26 01:10:56 +0200 |
| commit | 4dccb224c584194e964b5fbef5fe2cee28c57803 (patch) | |
| tree | e8c1714ebd576bcebcf933477539294d31362b59 /pkgs/stdenv | |
| parent | 3ec413ceced044131825c090f29a48768b562797 (diff) | |
WIP2
Diffstat (limited to 'pkgs/stdenv')
| -rw-r--r-- | pkgs/stdenv/common-path.nix | 2 | ||||
| -rw-r--r-- | pkgs/stdenv/generic/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/stdenv/linux/default.nix | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/stdenv/common-path.nix b/pkgs/stdenv/common-path.nix index cff6fd0a3eed..63c9f14b15c4 100644 --- a/pkgs/stdenv/common-path.nix +++ b/pkgs/stdenv/common-path.nix @@ -11,5 +11,5 @@ pkgs.gnumake pkgs.bash pkgs.patch - pkgs.xz + pkgs.xz.bin ] diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index 29f9f49a9281..118331feff6f 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -209,7 +209,7 @@ let # extra useful hooks, so we do not need to pass them as package arguments hookLib = { - multiout = ../../build-support/setup-hooks/multiple-outputs.sh; + multiout = ../../build-support/setup-hooks/multiple-outputs.sh; #ToDo: propagated-native-build-inputs #ToDo: add also autoreconf = pkgs.autoreconfHook }; } diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index aa76cd671917..a2a971589470 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -230,7 +230,7 @@ rec { gcc = stdenvLinuxBoot3Pkgs.gcc.gcc; name = ""; }; - extraBuildInputs = [ stdenvLinuxBoot2Pkgs.patchelf stdenvLinuxBoot3Pkgs.xz ]; + extraBuildInputs = [ stdenvLinuxBoot2Pkgs.patchelf stdenvLinuxBoot3Pkgs.xz.bin ]; overrides = pkgs: { inherit (stdenvLinuxBoot1Pkgs) perl; inherit (stdenvLinuxBoot3Pkgs) gettext gnum4 gmp; |