diff options
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/build-support/gcc-cross-wrapper/setup-hook.sh | 7 | ||||
| -rw-r--r-- | pkgs/development/interpreters/guile/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/development/tools/misc/libtool/libtool2.nix | 2 | ||||
| -rw-r--r-- | pkgs/shells/bash/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 3 |
5 files changed, 13 insertions, 8 deletions
diff --git a/pkgs/build-support/gcc-cross-wrapper/setup-hook.sh b/pkgs/build-support/gcc-cross-wrapper/setup-hook.sh index 8edfa1ac92b..81735a4feff 100644 --- a/pkgs/build-support/gcc-cross-wrapper/setup-hook.sh +++ b/pkgs/build-support/gcc-cross-wrapper/setup-hook.sh @@ -20,8 +20,11 @@ if test -n "@binutils@"; then PATH=$PATH:@binutils@/bin fi -if test -n "@glibc@"; then - PATH=$PATH:@glibc@/bin +if test -n "@libc@"; then + PATH=$PATH:@libc@/bin + addCVars @libc@ fi configureFlags="$configureFlags --build=$system --host=$crossConfig" +dontPatchELF=1 +dontStrip=1 diff --git a/pkgs/development/interpreters/guile/default.nix b/pkgs/development/interpreters/guile/default.nix index 7e2de8c942e..f81f8ab1e82 100644 --- a/pkgs/development/interpreters/guile/default.nix +++ b/pkgs/development/interpreters/guile/default.nix @@ -8,8 +8,9 @@ stdenv.mkDerivation rec { sha256 = "1czhcrn6l63xhsw3fjmv88djflqxbdpxjhgmwwvscm8rv4wn7vmz"; }; - buildInputs = [ makeWrapper ]; - propagatedBuildInputs = [readline libtool gmp gawk]; + buildNativeInputs = [ makeWrapper ]; + propagatedBuildInputs = [ libtool ]; + propagatedBuildNativeInputs = [readline gmp gawk]; postInstall = '' wrapProgram $out/bin/guile-snarf --prefix PATH : "${gawk}/bin" diff --git a/pkgs/development/tools/misc/libtool/libtool2.nix b/pkgs/development/tools/misc/libtool/libtool2.nix index 0119515740d..84921daf810 100644 --- a/pkgs/development/tools/misc/libtool/libtool2.nix +++ b/pkgs/development/tools/misc/libtool/libtool2.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1bmpp31sfjl3nzj8psvnsqrrv4gwnqzii8dxpxr6djz508yavsv6"; }; - buildInputs = [ lzma m4 perl ]; + buildNativeInputs = [ lzma m4 perl ]; unpackCmd = "lzma -d < $src | tar xv"; diff --git a/pkgs/shells/bash/default.nix b/pkgs/shells/bash/default.nix index 02736dec285..59b3ef73275 100644 --- a/pkgs/shells/bash/default.nix +++ b/pkgs/shells/bash/default.nix @@ -32,8 +32,8 @@ stdenv.mkDerivation rec { import ./bash-patches.nix patch; # Note: Bison is needed because the patches above modify parse.y. - buildInputs = [bison] - ++ stdenv.lib.optional (texinfo != null) texinfo + buildNativeInputs = [bison]; + buildInputs = stdenv.lib.optional (texinfo != null) texinfo ++ stdenv.lib.optional interactive readline; configureFlags = "--with-installed-readline"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 922511e41ba..629d3fe89d7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -132,7 +132,8 @@ let # inside the set for derivations. recurseIntoAttrs = attrs: attrs // {recurseForDerivations = true;}; - useFromStdenv = it : alternative : if (builtins.hasAttr it stdenv) then + useFromStdenv = it : alternative : if ((bootStdenv != null || + crossSystem == null) && builtins.hasAttr it stdenv) then (builtins.getAttr it stdenv) else alternative; # Return the first available value in the order: pkg.val, val, or default. |