swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-20 20:39:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Trying to fix the nixpkgs-tarball, after I broke it again due to assuming

Browse source 
'gcc' to be pure as that of stdenvLinux.


svn path=/nixpkgs/trunk/; revision=20671
This commit is contained in:
Lluís Batlle i Rossell 2010-03-16 21:53:48 +00:00
parent 1d71fc8923
commit 23809aa681
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/top-level/all-packages.nix
View file

@ -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 {