From 23809aa68101f49b6b5c3c99e712e1debde70a08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Tue, 16 Mar 2010 21:53:48 +0000 Subject: [PATCH] Trying to fix the nixpkgs-tarball, after I broke it again due to assuming 'gcc' to be pure as that of stdenvLinux. svn path=/nixpkgs/trunk/; revision=20671 --- pkgs/top-level/all-packages.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 11051aef8491..f8a55f8d5356 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2466,12 +2466,14 @@ let }; wrapGCC = wrapGCCWith (import ../build-support/gcc-wrapper) glibc; + # To be removed on stdenv-updates # By now this has at least the fix of setting the proper rpath when a file "libbla.so" # is passed directly to the linker. # This is of interest to programs built by cmake, because this is a common practice # in cmake builds. wrapGCC2 = wrapGCCWith (import ../build-support/gcc-wrapper/default2.nix) glibc; + stdenv2 = if (gcc.nativeTools) then stdenv else (overrideGCC stdenv (wrapGCC2 gcc.gcc)); wrapGCCCross = {gcc, libc, binutils, cross, shell ? "", name ? "gcc-cross-wrapper"}: @@ -6779,7 +6781,7 @@ let alsaLib lame faac faad2 libvorbis; inherit (gtkLibs) gtk; inherit (xlibs) libXv pixman libpthreadstubs libXau libXdmcp; - stdenv = overrideGCC stdenv (wrapGCC2 gcc.gcc); + stdenv = stdenv2; }; awesome = import ../applications/window-managers/awesome { @@ -7908,7 +7910,7 @@ let paraview = import ../applications/graphics/paraview { inherit fetchurl cmake qt4; - stdenv = overrideGCC stdenv (wrapGCC2 gcc.gcc); + stdenv = stdenv2; }; partitionManager = import ../tools/misc/partition-manager {