public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

stdenv multiple-outputs: change propagation rules

Browse Source 
Now development stuff is propagated from the first output,
and userEnvPkgs from the one with binaries.

Also don't move *.la files (yet). It causes problems, and they're small.
This commit is contained in:
Vladimír Čunát
2015-04-18 15:46:00 +02:00
parent bf414c9d4f
commit d484c392aa
5 changed files with 55 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/build-support/cc-wrapper/default.nix
View File

@@ -28,6 +28,7 @@ let
libc_bin = if nativeLibc then null else libc.bin or libc;
libc_dev = if nativeLibc then null else libc.dev or libc;
libc_lib = if nativeLibc then null else libc.out or libc;
binutils_bin = if nativeTools then null else binutils.bin or binutils;
# The wrapper scripts use 'cat', so we may need coreutils.
coreutils_bin = if nativeTools then null else coreutils.bin or coreutils;
@@ -40,7 +41,7 @@ stdenv.mkDerivation {
preferLocalBuild = true;
inherit cc shell libc_bin libc_dev binutils_bin coreutils_bin;
inherit cc shell libc_bin libc_dev libc_lib binutils_bin coreutils_bin;
passthru = { inherit libc nativeTools nativeLibc nativePrefix; };
@@ -58,11 +59,11 @@ stdenv.mkDerivation {
''
+ optionalString (!nativeLibc) (if (!stdenv.isDarwin) then ''
dynamicLinker="${libc}/lib/$dynamicLinker"
dynamicLinker="${libc_lib}/lib/$dynamicLinker"
echo $dynamicLinker > $out/nix-support/dynamic-linker
if [ -e ${libc}/lib/32/ld-linux.so.2 ]; then
echo ${libc}/lib/32/ld-linux.so.2 > $out/nix-support/dynamic-linker-m32
if [ -e ${libc_lib}/lib/32/ld-linux.so.2 ]; then
echo ${libc_lib}/lib/32/ld-linux.so.2 > $out/nix-support/dynamic-linker-m32
fi
# The dynamic linker is passed in `ldflagsBefore' to allow
@@ -87,11 +88,11 @@ stdenv.mkDerivation {
# compile, because it uses "#include_next <limits.h>" to find the
# limits.h file in ../includes-fixed. To remedy the problem,
# another -idirafter is necessary to add that directory again.
echo "-B${libc}/lib/ -idirafter ${libc_dev}/include -idirafter $cc/lib/gcc/*/*/include-fixed" > $out/nix-support/libc-cflags
echo "-B${libc_lib}/lib/ -idirafter ${libc_dev}/include -idirafter $cc/lib/gcc/*/*/include-fixed" > $out/nix-support/libc-cflags
echo "-L${libc}/lib" > $out/nix-support/libc-ldflags
echo "-L${libc_lib}/lib" > $out/nix-support/libc-ldflags
echo "${libc}" > $out/nix-support/orig-libc
echo "${libc_lib}" > $out/nix-support/orig-libc
''
+ (if nativeTools then ''