commit 28b6fb61e651a3e2cca57d087781e7ba6ab45e7c · pyrox.dev/nixpkgs

+3 -3

doc/old/cross.txt

···

       184
       184
        
           if test "$noSysDirs" = "1"; then

     

       185
       185
        
               # Figure out what extra flags to pass to the gcc compilers

     

       186
       186
        
               # being generated to make sure that they use our glibc.

     

       187
       187
       -
               if test -e $NIX_GCC/nix-support/orig-glibc; then

     

       188
       188
       -
                   glibc=$(cat $NIX_GCC/nix-support/orig-glibc)

     

       187
       187
       +
               if test -e $NIX_CC/nix-support/orig-glibc; then

     

       188
       188
       +
                   glibc=$(cat $NIX_CC/nix-support/orig-glibc)

     

       189
       189
        
                   # Ugh.  Copied from gcc-wrapper/builder.sh.  We can't just

     

       190
       190
       -
                   # source in $NIX_GCC/nix-support/add-flags, since that

     

       190
       190
       +
                   # source in $NIX_CC/nix-support/add-flags, since that

     

       191
       191
        
                   # would cause *this* GCC to be linked against the

     

       192
       192
        
                   # *previous* GCC.  Need some more modularity there.

     

       193
       193
        
                   extraCFlags="-B$glibc/lib -isystem $glibc/include"

+1 -1

maintainers/scripts/patchelf-hints.sh

···

       62
       62
        
               )

     

       63
       63
        
       

     

       64
       64
        
               if test "$names" = "glibc"; then names="stdenv.glibc"; fi

     

       65
       65
       -
               if echo $names | grep -c "gcc" &> /dev/null; then names="stdenv.gcc.gcc"; fi

     

       65
       65
       +
               if echo $names | grep -c "gcc" &> /dev/null; then names="stdenv.cc.gcc"; fi

     

       66
       66
        
       

     

       67
       67
        
               if test $lib != $libPath; then

     

       68
       68
        
                   interpreter="--interpreter \${$names}/lib/$lib"

+1 -1

pkgs/applications/audio/amarok/default.nix

···

       16
       16
        
       

     

       17
       17
        
         QT_PLUGIN_PATH="${qtscriptgenerator}/lib/qt4/plugins";

     

       18
       18
        
       

     

       19
       19
       -
         buildInputs = [ qtscriptgenerator stdenv.gcc.libc gettext curl

     

       19
       19
       +
         buildInputs = [ qtscriptgenerator stdenv.cc.libc gettext curl

     

       20
       20
        
           libxml2 mysql taglib taglib_extras loudmouth kdelibs automoc4 phonon strigi

     

       21
       21
        
           soprano qca2 libmtp liblastfm libgpod pkgconfig qjson ffmpeg libofa nepomuk_core ];

     

       22
       22

+2

pkgs/applications/audio/cdparanoia/default.nix

···

       7
       7
        
           url = "http://downloads.xiph.org/releases/cdparanoia/${name}.src.tgz";

     

       8
       8
        
           sha256 = "1pv4zrajm46za0f6lv162iqffih57a8ly4pc69f7y0gfyigb8p80";

     

       9
       9
        
         };

     

       10
       10
       +
       

     

       11
       11
       +
         preConfigure = "unset CC";

     

       10
       12
        
         

     

       11
       13
        
         meta = {

     

       12
       14
        
           homepage = http://xiph.org/paranoia;

+2 -2

pkgs/applications/audio/google-musicmanager/default.nix

···

       33
       33
        
       

     

       34
       34
        
         buildPhase = ''

     

       35
       35
        
           patchelf \

     

       36
       36
       -
             --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \

     

       37
       37
       -
             --set-rpath "$out/opt/google/musicmanager:${readline}/lib:${ncurses}/lib:${stdenv.gcc.libc}/lib:${qt48}/lib:${stdenv.gcc.gcc}/lib:${libidn}/lib:${expat}/lib:${flac}/lib:${libvorbis}/lib" opt/google/musicmanager/MusicManager

     

       36
       36
       +
             --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \

     

       37
       37
       +
             --set-rpath "$out/opt/google/musicmanager:${readline}/lib:${ncurses}/lib:${stdenv.cc.libc}/lib:${qt48}/lib:${stdenv.cc.gcc}/lib:${libidn}/lib:${expat}/lib:${flac}/lib:${libvorbis}/lib" opt/google/musicmanager/MusicManager

     

       38
       38
        
         '';

     

       39
       39
        
       

     

       40
       40
        
         dontPatchELF = true;

+4 -4

pkgs/applications/audio/spotify/default.nix

···

       45
       45
        
           pango

     

       46
       46
        
           qt4

     

       47
       47
        
           sqlite

     

       48
       48
       -
           stdenv.gcc.gcc

     

       48
       48
       +
           stdenv.cc.gcc

     

       49
       49
        
           xlibs.libX11

     

       50
       50
        
           xlibs.libXcomposite

     

       51
       51
        
           xlibs.libXdamage

     
···

       113
       113
        
       

     

       114
       114
        
             mkdir -p $out/bin

     

       115
       115
        
       

     

       116
       116
       -
             rpath="$out/spotify-client/Data:$out/lib:$out/spotify-client:${stdenv.gcc.gcc}/lib64"

     

       116
       116
       +
             rpath="$out/spotify-client/Data:$out/lib:$out/spotify-client:${stdenv.cc.gcc}/lib64"

     

       117
       117
        
       

     

       118
       118
        
             ln -s $out/spotify-client/spotify $out/bin/spotify

     

       119
       119
        
       

     

       120
       120
        
             patchelf \

     

       121
       121
       -
               --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \

     

       121
       121
       +
               --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \

     

       122
       122
        
               --set-rpath $rpath $out/spotify-client/spotify

     

       123
       123
        
       

     

       124
       124
        
             patchelf \

     

       125
       125
       -
               --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \

     

       125
       125
       +
               --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \

     

       126
       126
        
               --set-rpath $rpath $out/spotify-client/Data/SpotifyHelper

     

       127
       127
        
       

     

       128
       128
        
             dpkg-deb -x ${qt4webkit} ./

+3 -3

pkgs/applications/editors/atom/default.nix

···

       7
       7
        
         atomEnv = buildEnv {

     

       8
       8
        
           name = "env-atom";

     

       9
       9
        
           paths = [

     

       10
       10
       -
             stdenv.gcc.gcc zlib glib dbus gtk atk pango freetype libgnome_keyring3

     

       10
       10
       +
             stdenv.cc.gcc zlib glib dbus gtk atk pango freetype libgnome_keyring3

     

       11
       11
        
             fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr gconf nss

     

       12
       12
        
             xlibs.libXrender xlibs.libX11 xlibs.libXext xlibs.libXdamage xlibs.libXtst

     

       13
       13
        
             xlibs.libXcomposite xlibs.libXi xlibs.libXfixes xlibs.libXrandr

     
···

       33
       33
        
           ar p $src data.tar.gz | tar -C $out -xz ./usr

     

       34
       34
        
           mv $out/usr/* $out/

     

       35
       35
        
           rm -r $out/usr/

     

       36
       36
       -
           patchelf --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \

     

       36
       36
       +
           patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \

     

       37
       37
        
             $out/share/atom/atom

     

       38
       38
       -
           patchelf --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \

     

       38
       38
       +
           patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \

     

       39
       39
        
             $out/share/atom/resources/app/apm/node_modules/atom-package-manager/bin/node

     

       40
       40
        
           wrapProgram $out/bin/atom \

     

       41
       41
        
             --prefix "LD_LIBRARY_PATH" : "${atomEnv}/lib:${atomEnv}/lib64"

+1 -1

pkgs/applications/editors/codeblocks/default.nix

···

       19
       19
        
         enableParallelBuilding = true;

     

       20
       20
        
         patches = [ ./writable-projects.patch ];

     

       21
       21
        
         preConfigure = "substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file";

     

       22
       22
       -
         postConfigure = optionalString stdenv.isLinux "substituteInPlace libtool --replace ldconfig ${stdenv.gcc.libc}/sbin/ldconfig";

     

       22
       22
       +
         postConfigure = optionalString stdenv.isLinux "substituteInPlace libtool --replace ldconfig ${stdenv.cc.libc}/sbin/ldconfig";

     

       23
       23
        
         configureFlags = [ "--enable-pch=no" ]

     

       24
       24
        
           ++ optional contribPlugins "--with-contrib-plugins";

     

       25
       25

+1 -1

pkgs/applications/editors/emacs-24/builder.sh

···

       11
       11
        
               *)              return;

     

       12
       12
        
           esac

     

       13
       13
        
       

     

       14
       14
       -
           libc=$(cat ${NIX_GCC}/nix-support/orig-libc)

     

       14
       14
       +
           libc=$(cat ${NIX_CC}/nix-support/orig-libc)

     

       15
       15
        
           echo "libc: $libc"

     

       16
       16
        
       

     

       17
       17
        
           for i in src/s/*.h src/m/*.h; do

+3 -3

pkgs/applications/editors/idea/default.nix

···

       56
       56
        
               snappyPath="lib/snappy-java-1.0.5"

     

       57
       57
        
               7z x -o"$snappyPath" "$snappyPath.jar"

     

       58
       58
        
               if [ "${stdenv.system}" == "x86_64-linux" ]; then

     

       59
       59
       -
                 patchelf --set-rpath ${stdenv.gcc.gcc}/lib64 "$snappyPath/org/xerial/snappy/native/Linux/amd64/libsnappyjava.so"

     

       59
       59
       +
                 patchelf --set-rpath ${stdenv.cc.gcc}/lib64 "$snappyPath/org/xerial/snappy/native/Linux/amd64/libsnappyjava.so"

     

       60
       60
        
               else

     

       61
       61
       -
                 patchelf --set-rpath ${stdenv.gcc.gcc}/lib "$snappyPath/org/xerial/snappy/native/Linux/i386/libsnappyjava.so"

     

       61
       61
       +
                 patchelf --set-rpath ${stdenv.cc.gcc}/lib "$snappyPath/org/xerial/snappy/native/Linux/i386/libsnappyjava.so"

     

       62
       62
        
               fi

     

       63
       63
        
               7z a -tzip "$snappyPath.jar" ./"$snappyPath"/*

     

       64
       64
        
               rm -vr "$snappyPath"

     
···

       76
       76
        
       

     

       77
       77
        
             makeWrapper "$out/$name/bin/${loName}.sh" "$out/bin/${loName}" \

     

       78
       78
        
               --prefix PATH : "${jdk}/bin:${coreutils}/bin:${gnugrep}/bin:${which}/bin:${git}/bin" \

     

       79
       79
       -
               --prefix LD_RUN_PATH : "${stdenv.gcc.gcc}/lib/" \

     

       79
       79
       +
               --prefix LD_RUN_PATH : "${stdenv.cc.gcc}/lib/" \

     

       80
       80
        
               --prefix JDK_HOME : "$jdk" \

     

       81
       81
        
               --prefix ${hiName}_JDK : "$jdk"

     

       82
       82

+3 -3

pkgs/applications/editors/lighttable/default.nix

···

       5
       5
        
       

     

       6
       6
        
       let

     

       7
       7
        
         libPath = stdenv.lib.makeLibraryPath [

     

       8
       8
       -
             stdenv.gcc.gcc zlib glib dbus gtk atk pango freetype libgnome_keyring3 nss

     

       8
       8
       +
             stdenv.cc.gcc zlib glib dbus gtk atk pango freetype libgnome_keyring3 nss

     

       9
       9
        
             fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr gnome3.gconf

     

       10
       10
        
             xlibs.libXrender xlibs.libX11 xlibs.libXext xlibs.libXdamage xlibs.libXtst

     

       11
       11
        
             xlibs.libXcomposite xlibs.libXi xlibs.libXfixes

     
···

       40
       40
        
           mv LightTable $out/

     

       41
       41
        
       

     

       42
       42
        
           patchelf \

     

       43
       43
       -
             --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \

     

       44
       44
       -
             --set-rpath ${libPath}:${stdenv.gcc.gcc}/lib${stdenv.lib.optionalString stdenv.is64bit "64"} \

     

       43
       43
       +
             --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \

     

       44
       44
       +
             --set-rpath ${libPath}:${stdenv.cc.gcc}/lib${stdenv.lib.optionalString stdenv.is64bit "64"} \

     

       45
       45
        
             $out/LightTable/ltbin

     

       46
       46
        
       

     

       47
       47
        
           ln -s ${udev}/lib/libudev.so.1 $out/LightTable/libudev.so.0

+2 -2

pkgs/applications/editors/sublime/default.nix

···

       28
       28
        
       

     

       29
       29
        
           echo ${libPath}

     

       30
       30
        
           patchelf \

     

       31
       31
       -
             --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \

     

       32
       32
       -
             --set-rpath ${libPath}:${stdenv.gcc.gcc}/lib${stdenv.lib.optionalString stdenv.is64bit "64"} \

     

       31
       31
       +
             --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \

     

       32
       32
       +
             --set-rpath ${libPath}:${stdenv.cc.gcc}/lib${stdenv.lib.optionalString stdenv.is64bit "64"} \

     

       33
       33
        
             $out/sublime/sublime_text

     

       34
       34
        
         '';

     

       35
       35

+3 -3

pkgs/applications/editors/sublime3/default.nix

···

       31
       31
        
           buildPhase = ''

     

       32
       32
        
             for i in sublime_text plugin_host crash_reporter; do

     

       33
       33
        
               patchelf \

     

       34
       34
       -
                 --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \

     

       35
       35
       -
                 --set-rpath ${libPath}:${stdenv.gcc.gcc}/lib${stdenv.lib.optionalString stdenv.is64bit "64"} \

     

       34
       34
       +
                 --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \

     

       35
       35
       +
                 --set-rpath ${libPath}:${stdenv.cc.gcc}/lib${stdenv.lib.optionalString stdenv.is64bit "64"} \

     

       36
       36
        
                 $i

     

       37
       37
        
             done

     

       38
       38
        
           '';

     
···

       41
       41
        
             mkdir -p $out

     

       42
       42
        
             cp -prvd * $out/

     

       43
       43
        
             # Without this, plugin_host crashes, even though it has the rpath

     

       44
       44
       -
             wrapProgram $out/plugin_host --prefix LD_PRELOAD : ${stdenv.gcc.gcc}/lib${stdenv.lib.optionalString stdenv.is64bit "64"}/libgcc_s.so.1:${openssl}/lib/libssl.so:${bzip2}/lib/libbz2.so

     

       44
       44
       +
             wrapProgram $out/plugin_host --prefix LD_PRELOAD : ${stdenv.cc.gcc}/lib${stdenv.lib.optionalString stdenv.is64bit "64"}/libgcc_s.so.1:${openssl}/lib/libssl.so:${bzip2}/lib/libbz2.so

     

       45
       45
        
           '';

     

       46
       46
        
         };

     

       47
       47
        
       in stdenv.mkDerivation {

+1 -1

pkgs/applications/misc/adobe-reader/builder.sh

···

       17
       17
        
       # More pointless files.

     

       18
       18
        
       rm $p/bin/UNINSTALL

     

       19
       19
        
       

     

       20
       20
       -
       patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \

     

       20
       20
       +
       patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \

     

       21
       21
        
           --set-rpath $libPath \

     

       22
       22
        
           $p/Reader/intellinux/bin/acroread

     

       23
       23

+1 -1

pkgs/applications/misc/adobe-reader/default.nix

···

       20
       20
        
         # versions.

     

       21
       21
        
       

     

       22
       22
        
         libPath = stdenv.lib.makeLibraryPath

     

       23
       23
       -
           [ stdenv.gcc.gcc libX11 zlib libxml2 cups pango atk gtk glib gdk_pixbuf ];

     

       23
       23
       +
           [ stdenv.cc.gcc libX11 zlib libxml2 cups pango atk gtk glib gdk_pixbuf ];

     

       24
       24
        
       

     

       25
       25
        
         meta = {

     

       26
       26
        
           description = "Adobe Reader, a viewer for PDF documents";

+2 -2

pkgs/applications/misc/googleearth/default.nix

···

       16
       16
        
         nativeBuildInputs = [

     

       17
       17
        
           glibc

     

       18
       18
        
           glib

     

       19
       19
       -
           stdenv.gcc.gcc

     

       19
       19
       +
           stdenv.cc.gcc

     

       20
       20
        
           libSM 

     

       21
       21
        
           libICE 

     

       22
       22
        
           libXi 

     
···

       59
       59
        
             fullPath=$fullPath:$i/lib

     

       60
       60
        
           done

     

       61
       61
        
                 

     

       62
       62
       -
           patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \

     

       62
       62
       +
           patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \

     

       63
       63
        
             --set-rpath $fullPath \

     

       64
       64
        
             $out/opt/googleearth/googleearth-bin

     

       65
       65

+1 -1

pkgs/applications/misc/ikiwiki/default.nix

···

       53
       53
        
           sed -i /ENV{PATH}/d ikiwiki.in

     

       54
       54
        
           # State the gcc dependency, and make the cgi use our wrapper

     

       55
       55
        
           sed -i -e 's@$0@"'$out/bin/ikiwiki'"@' \

     

       56
       56
       -
               -e "s@'cc'@'${stdenv.gcc}/bin/gcc'@" IkiWiki/Wrapper.pm

     

       56
       56
       +
               -e "s@'cc'@'${stdenv.cc}/bin/gcc'@" IkiWiki/Wrapper.pm

     

       57
       57
        
         '';

     

       58
       58
        
       

     

       59
       59
        
         configurePhase = "perl Makefile.PL PREFIX=$out";

+1 -1

pkgs/applications/misc/k3b/default.nix

···

       15
       15
        
         buildInputs =

     

       16
       16
        
           [ cmake qt4 perl shared_mime_info libvorbis taglib

     

       17
       17
        
             flac libsamplerate libdvdread lame libsndfile

     

       18
       18
       -
             libmad gettext stdenv.gcc.libc

     

       18
       18
       +
             libmad gettext stdenv.cc.libc

     

       19
       19
        
             kdelibs kdemultimedia automoc4 phonon

     

       20
       20
        
             libkcddb makeWrapper cdparanoia

     

       21
       21
        
           ];

+1 -1

pkgs/applications/misc/mysql-workbench/default.nix

···

       31
       31
        
         postInstall = ''

     

       32
       32
        
           wrapProgram "$out/bin/mysql-workbench" \

     

       33
       33
        
             --prefix LD_LIBRARY_PATH : "${python}/lib" \

     

       34
       34
       -
             --prefix LD_LIBRARY_PATH : "$(cat ${stdenv.gcc}/nix-support/orig-gcc)/lib64" \

     

       34
       34
       +
             --prefix LD_LIBRARY_PATH : "$(cat ${stdenv.cc}/nix-support/orig-gcc)/lib64" \

     

       35
       35
        
             --prefix PATH : "${gnome_keyring}/bin" \

     

       36
       36
        
             --prefix PATH : "${python}/bin" \

     

       37
       37
        
             --set PYTHONPATH $PYTHONPATH \

+1 -1

pkgs/applications/misc/procmail/default.nix

···

       3
       3
        
       stdenv.mkDerivation {

     

       4
       4
        
         name = "procmail-3.22";

     

       5
       5
        
       

     

       6
       6
       -
         buildInputs = [ stdenv.gcc.libc ];

     

       6
       6
       +
         buildInputs = [ stdenv.cc.libc ];

     

       7
       7
        
       

     

       8
       8
        
         # getline is defined differently in glibc now. So rename it.

     

       9
       9
        
         installPhase = "

+1 -1

pkgs/applications/misc/rescuetime/default.nix

···

       28
       28
        
           cp usr/bin/rescuetime $out/bin

     

       29
       29
        
       

     

       30
       30
        
           ${patchelf}/bin/patchelf \

     

       31
       31
       -
             --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \

     

       31
       31
       +
             --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \

     

       32
       32
        
             $out/bin/rescuetime

     

       33
       33
        
       

     

       34
       34
        
           wrapProgram $out/bin/rescuetime \

+2 -2

pkgs/applications/networking/bittorrentsync/default.nix

···

       9
       9
        
           else if stdenv.system == "i686-linux" then "0jv3zg0jhdzsc56kkpylwihvhsz73gsl2i2pjmqk3r3x4gwjk8xx"

     

       10
       10
        
           else throw "Bittorrent Sync for: ${stdenv.system} not supported!";

     

       11
       11
        
       

     

       12
       12
       -
         libPath = stdenv.lib.makeLibraryPath [ stdenv.gcc.libc ];

     

       12
       12
       +
         libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.libc ];

     

       13
       13
        
       in

     

       14
       14
        
       stdenv.mkDerivation rec {

     

       15
       15
        
         name = "btsync-${version}";

     
···

       28
       28
        
           mkdir -p "$out/bin/"

     

       29
       29
        
           cp -r "btsync" "$out/bin/"

     

       30
       30
        
       

     

       31
       31
       -
           patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \

     

       31
       31
       +
           patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \

     

       32
       32
        
             --set-rpath ${libPath} "$out/bin/btsync"

     

       33
       33
        
         '';

     

       34
       34

+1 -1

pkgs/applications/networking/browsers/chromium/plugins.nix

···

       35
       35
        
           '';

     

       36
       36
        
       

     

       37
       37
        
           patchPhase = let

     

       38
       38
       -
             rpaths = [ stdenv.gcc.gcc ];

     

       38
       38
       +
             rpaths = [ stdenv.cc.gcc ];

     

       39
       39
        
             mkrpath = p: "${makeSearchPath "lib64" p}:${makeSearchPath "lib" p}";

     

       40
       40
        
           in ''

     

       41
       41
        
             for sofile in PepperFlash/libpepflashplayer.so \

+3 -3

pkgs/applications/networking/browsers/firefox-bin/default.nix

···

       70
       70
        
         phases = "unpackPhase installPhase";

     

       71
       71
        
       

     

       72
       72
        
         libPath = stdenv.lib.makeLibraryPath

     

       73
       73
       -
           [ stdenv.gcc.gcc

     

       73
       73
       +
           [ stdenv.cc.gcc

     

       74
       74
        
             alsaLib

     

       75
       75
        
             atk

     

       76
       76
        
             cairo

     
···

       106
       106
        
             pulseaudio

     

       107
       107
        
             systemd

     

       108
       108
        
           ] + ":" + stdenv.lib.makeSearchPath "lib64" [

     

       109
       109
       -
             stdenv.gcc.gcc

     

       109
       109
       +
             stdenv.cc.gcc

     

       110
       110
        
           ];

     

       111
       111
        
       

     

       112
       112
        
         # "strip" after "patchelf" may break binaries.

     
···

       125
       125
        
               firefox mozilla-xremote-client firefox-bin plugin-container \

     

       126
       126
        
               updater crashreporter webapprt-stub

     

       127
       127
        
             do

     

       128
       128
       -
               patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \

     

       128
       128
       +
               patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \

     

       129
       129
        
                 "$out/usr/lib/firefox-bin-${version}/$executable"

     

       130
       130
        
             done

     

       131
       131

+1 -1

pkgs/applications/networking/browsers/firefox/default.nix

···

       13
       13
        
         enableOfficialBranding ? false

     

       14
       14
        
       }:

     

       15
       15
        
       

     

       16
       16
       -
       assert stdenv.gcc ? libc && stdenv.gcc.libc != null;

     

       16
       16
       +
       assert stdenv.cc ? libc && stdenv.cc.libc != null;

     

       17
       17
        
       

     

       18
       18
        
       let version = "34.0.5"; in

     

       19
       19

+5 -5

pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix

···

       32
       32
        
             xorg.libXfixes

     

       33
       33
        
             xorg.libXrender

     

       34
       34
        
             xorg.libXrandr

     

       35
       35
       -
             stdenv.gcc.gcc

     

       35
       35
       +
             stdenv.cc.gcc

     

       36
       36
        
             alsaLib

     

       37
       37
        
             pulseaudio

     

       38
       38
        
             dbus_glib

     
···

       76
       76
        
             cp opt/google/talkplugin/*.so $plugins

     

       77
       77
        
       

     

       78
       78
        
             for i in libnpgoogletalk.so libppgoogletalk.so libppo1d.so; do

     

       79
       79
       -
               patchelf --set-rpath "${makeLibraryPath [ stdenv.gcc.gcc xorg.libX11 ]}:${stdenv.gcc.gcc}/lib64" $plugins/$i

     

       79
       79
       +
               patchelf --set-rpath "${makeLibraryPath [ stdenv.cc.gcc xorg.libX11 ]}:${stdenv.cc.gcc}/lib64" $plugins/$i

     

       80
       80
        
             done

     

       81
       81
        
       

     

       82
       82
        
             for i in libgoogletalkremoting.so libnpo1d.so; do

     

       83
       83
       -
               patchelf --set-rpath "$out/libexec/google/talkplugin/lib:${rpathPlugin}:${stdenv.gcc.gcc}/lib64" $plugins/$i

     

       83
       83
       +
               patchelf --set-rpath "$out/libexec/google/talkplugin/lib:${rpathPlugin}:${stdenv.cc.gcc}/lib64" $plugins/$i

     

       84
       84
        
             done

     

       85
       85
        
       

     

       86
       86
        
             mkdir -p $out/libexec/google/talkplugin

     

       87
       87
        
             cp -prd opt/google/talkplugin/{data,GoogleTalkPlugin,locale,remoting24x24.png,windowpicker.glade} $out/libexec/google/talkplugin/

     

       88
       88
        
       

     

       89
       89
        
             patchelf \

     

       90
       90
       -
               --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \

     

       91
       91
       -
               --set-rpath "${rpathProgram}:${stdenv.gcc.gcc}/lib64" \

     

       90
       90
       +
               --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \

     

       91
       91
       +
               --set-rpath "${rpathProgram}:${stdenv.cc.gcc}/lib64" \

     

       92
       92
        
               $out/libexec/google/talkplugin/GoogleTalkPlugin

     

       93
       93
        
       

     

       94
       94
        
             # Generate an LD_PRELOAD wrapper to redirect execvp() calls to

+3 -3

pkgs/applications/networking/browsers/opera/default.nix

···

       6
       6
        
       , kdeSupport ? false, qt4, kdelibs

     

       7
       7
        
       }:

     

       8
       8
        
       

     

       9
       9
       -
       assert stdenv.isLinux && stdenv.gcc.gcc != null && stdenv.gcc.libc != null;

     

       9
       9
       +
       assert stdenv.isLinux && stdenv.cc.gcc != null && stdenv.cc.libc != null;

     

       10
       10
        
       

     

       11
       11
        
       let

     

       12
       12
        
         mirror = http://get.geo.opera.com/pub/opera;

     
···

       37
       37
        
           '';

     

       38
       38
        
       

     

       39
       39
        
         buildInputs =

     

       40
       40
       -
           [ stdenv.gcc.gcc stdenv.gcc.libc zlib libX11 libXt libXext libSM libICE

     

       40
       40
       +
           [ stdenv.cc.gcc stdenv.cc.libc zlib libX11 libXt libXext libSM libICE

     

       41
       41
        
             libXft freetype fontconfig libXrender libuuid expat

     

       42
       42
        
             gstreamer libxml2 gst_plugins_base

     

       43
       43
        
           ]

     
···

       57
       57
        
             elif [ $type == "EXEC" ]; then

     

       58
       58
        
               echo "patching $f executable <<"

     

       59
       59
        
               patchelf \

     

       60
       60
       -
                   --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \

     

       60
       60
       +
                   --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \

     

       61
       61
        
                   --set-rpath "${libPath}" \

     

       62
       62
        
                   "$f"

     

       63
       63
        
             elif [ $type == "DYN" ]; then

+1 -1

pkgs/applications/networking/cluster/hadoop/default.nix

···

       15
       15
        
           for n in "bin/"* "sbin/"*; do

     

       16
       16
        
             sed -i $n -e "s|#!/usr/bin/env bash|#! ${bash}/bin/bash|"

     

       17
       17
        
           done

     

       18
       18
       -
           patchelf --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" bin/container-executor

     

       18
       18
       +
           patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" bin/container-executor

     

       19
       19
        
         '';

     

       20
       20
        
       

     

       21
       21
        
         installPhase = ''

+2 -2

pkgs/applications/networking/instant-messengers/baresip/default.nix

···

       32
       32
        
           "USE_BV32=" "USE_COREAUDIO=" "USE_G711=" "USE_G722=" "USE_G722_1=" 

     

       33
       33
        
           "USE_ILBC=" "USE_OPUS=" "USE_SILK=" 

     

       34
       34
        
         ]

     

       35
       35
       -
         ++ stdenv.lib.optional (stdenv.gcc.gcc != null) "SYSROOT_ALT=${stdenv.gcc.gcc}"

     

       36
       36
       -
         ++ stdenv.lib.optional (stdenv.gcc.libc != null) "SYSROOT=${stdenv.gcc.libc}"

     

       35
       35
       +
         ++ stdenv.lib.optional (stdenv.cc.gcc != null) "SYSROOT_ALT=${stdenv.cc.gcc}"

     

       36
       36
       +
         ++ stdenv.lib.optional (stdenv.cc.libc != null) "SYSROOT=${stdenv.cc.libc}"

     

       37
       37
        
         ;

     

       38
       38
        
         NIX_CFLAGS_COMPILE='' -I${librem}/include/rem -I${gsm}/include/gsm '';

     

       39
       39
        
         meta = {

+2 -2

pkgs/applications/networking/instant-messengers/fuze/default.nix

···

       19
       19
        
         libPath =

     

       20
       20
        
           stdenv.lib.makeLibraryPath [

     

       21
       21
        
             openssl alsaLib libXext libXfixes libXrandr libjpeg curl_custom

     

       22
       22
       -
             libX11 libXmu libXv qt4 libXtst mesa stdenv.gcc.gcc zlib

     

       22
       22
       +
             libX11 libXmu libXv qt4 libXtst mesa stdenv.cc.gcc zlib

     

       23
       23
        
             gnome.GConf libidn rtmpdump c-ares openldap

     

       24
       24
        
           ];

     

       25
       25
        
         buildCommand = ''

     
···

       28
       28
        
           cp -R usr/lib/fuzebox $out/lib

     

       29
       29
        
       

     

       30
       30
        
           patchelf \

     

       31
       31
       -
             --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \

     

       31
       31
       +
             --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \

     

       32
       32
        
             --set-rpath $out/lib/fuzebox:$libPath \

     

       33
       33
        
             $out/lib/fuzebox/FuzeLinuxApp

     

       34
       34

+2 -2

pkgs/applications/networking/instant-messengers/hipchat/default.nix

···

       41
       41
        
           xz

     

       42
       42
        
           libcanberra

     

       43
       43
        
           xcbutilkeysyms

     

       44
       44
       -
         ] + ":${stdenv.gcc.gcc}/lib${stdenv.lib.optionalString stdenv.is64bit "64"}";

     

       44
       44
       +
         ] + ":${stdenv.cc.gcc}/lib${stdenv.lib.optionalString stdenv.is64bit "64"}";

     

       45
       45
        
       

     

       46
       46
        
         src =

     

       47
       47
        
           if stdenv.system == "x86_64-linux" then

     
···

       76
       76
        
           mv usr/share $out

     

       77
       77
        
       

     

       78
       78
        
           for file in $(find $d -type f); do

     

       79
       79
       -
               patchelf --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" $file || true

     

       79
       79
       +
               patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $file || true

     

       80
       80
        
               patchelf --set-rpath ${rpath}:\$ORIGIN $file || true

     

       81
       81
        
           done

     

       82
       82

+2 -2

pkgs/applications/networking/instant-messengers/skype/default.nix

···

       14
       14
        
       

     

       15
       15
        
         buildInputs = [

     

       16
       16
        
           stdenv.glibc

     

       17
       17
       -
           stdenv.gcc.gcc

     

       17
       17
       +
           stdenv.cc.gcc

     

       18
       18
        
           libXv

     

       19
       19
        
           libXext

     

       20
       20
        
           libX11

     
···

       43
       43
        
             fullPath=$fullPath''${fullPath:+:}$i/lib

     

       44
       44
        
           done

     

       45
       45
        
       

     

       46
       46
       -
           patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \

     

       46
       46
       +
           patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \

     

       47
       47
        
               --set-rpath "$fullPath" $out/libexec/skype/skype

     

       48
       48
        
       

     

       49
       49
        
           cat > $out/bin/skype << EOF

+2 -2

pkgs/applications/networking/instant-messengers/teamspeak/client.nix

···

       46
       46
        
             mv ts3client_linux_${arch} ts3client

     

       47
       47
        
             echo "patching ts3client..."

     

       48
       48
        
             patchelf \

     

       49
       49
       -
               --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \

     

       50
       50
       -
               --set-rpath ${stdenv.lib.makeLibraryPath deps}:$(cat $NIX_GCC/nix-support/orig-gcc)/${libDir} \

     

       49
       49
       +
               --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \

     

       50
       50
       +
               --set-rpath ${stdenv.lib.makeLibraryPath deps}:$(cat $NIX_CC/nix-support/orig-gcc)/${libDir} \

     

       51
       51
        
               --force-rpath \

     

       52
       52
        
               ts3client

     

       53
       53
        
           '';

+2 -2

pkgs/applications/networking/instant-messengers/teamspeak/server.nix

···

       29
       29
        
             mv ts3server_linux_${arch} ts3server

     

       30
       30
        
             echo "patching ts3server"

     

       31
       31
        
             patchelf \

     

       32
       32
       -
               --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \

     

       33
       33
       -
               --set-rpath $(cat $NIX_GCC/nix-support/orig-gcc)/${libDir} \

     

       32
       32
       +
               --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \

     

       33
       33
       +
               --set-rpath $(cat $NIX_CC/nix-support/orig-gcc)/${libDir} \

     

       34
       34
        
               --force-rpath \

     

       35
       35
        
               ts3server

     

       36
       36
        
           '';

+1 -1

pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix

···

       115
       115
        
               thunderbird mozilla-xremote-client thunderbird-bin plugin-container \

     

       116
       116
        
               updater

     

       117
       117
        
             do

     

       118
       118
       -
               patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \

     

       118
       118
       +
               patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \

     

       119
       119
        
                 "$out/usr/lib/thunderbird-bin-${version}/$executable"

     

       120
       120
        
             done

     

       121
       121

+3 -3

pkgs/applications/networking/remote/teamviewer/8.nix

···

       5
       5
        
         topath = "${wineUnstable}/bin";

     

       6
       6
        
       

     

       7
       7
        
         toldpath = stdenv.lib.concatStringsSep ":" (map (x: "${x}/lib") 

     

       8
       8
       -
           [ stdenv.gcc.gcc libX11 libXtst libXext libXdamage libXfixes wineUnstable ]);

     

       8
       8
       +
           [ stdenv.cc.gcc libX11 libXtst libXext libXdamage libXfixes wineUnstable ]);

     

       9
       9
        
       in

     

       10
       10
        
       stdenv.mkDerivation {

     

       11
       11
        
         name = "teamviewer-8.0.17147";

     
···

       34
       34
        
           EOF

     

       35
       35
        
           chmod +x $out/bin/teamviewer

     

       36
       36
        
       

     

       37
       37
       -
           patchelf --set-rpath "${stdenv.gcc.gcc}/lib64:${stdenv.gcc.gcc}/lib:${libX11}/lib:${libXext}/lib:${libXau}/lib:${libXdamage}/lib:${libXfixes}/lib" $out/share/teamviewer8/tv_bin/teamviewerd

     

       38
       38
       -
           patchelf --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" $out/share/teamviewer8/tv_bin/teamviewerd

     

       37
       37
       +
           patchelf --set-rpath "${stdenv.cc.gcc}/lib64:${stdenv.cc.gcc}/lib:${libX11}/lib:${libXext}/lib:${libXau}/lib:${libXdamage}/lib:${libXfixes}/lib" $out/share/teamviewer8/tv_bin/teamviewerd

     

       38
       38
       +
           patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/share/teamviewer8/tv_bin/teamviewerd

     

       39
       39
        
           ln -s $out/share/teamviewer8/tv_bin/teamviewerd $out/bin/

     

       40
       40
        
         '';

     

       41
       41

+1 -1

pkgs/applications/networking/remote/teamviewer/9.nix

···

       35
       35
        
           chmod +x $out/bin/teamviewer

     

       36
       36
        
       

     

       37
       37
        
           patchelf --set-rpath "${stdenv.gcc.gcc}/lib64:${stdenv.gcc.gcc}/lib:${libX11}/lib:${libXext}/lib:${libXau}/lib:${libXdamage}/lib:${libXfixes}/lib" $out/share/teamviewer9/tv_bin/teamviewerd

     

       38
       38
       -
           patchelf --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" $out/share/teamviewer9/tv_bin/teamviewerd

     

       38
       38
       +
           patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/share/teamviewer9/tv_bin/teamviewerd

     

       39
       39
        
           ln -s $out/share/teamviewer9/tv_bin/teamviewerd $out/bin/

     

       40
       40
        
         '';

     

       41
       41

+1 -1

pkgs/applications/networking/remote/teamviewer/default.nix

···

       6
       6
        
         topath = "${wine}/bin";

     

       7
       7
        
       

     

       8
       8
        
         toldpath = stdenv.lib.concatStringsSep ":" (map (x: "${x}/lib") 

     

       9
       9
       -
           [ stdenv.gcc.gcc libX11 libXtst libXext libXdamage libXfixes wine ]);

     

       9
       9
       +
           [ stdenv.cc.gcc libX11 libXtst libXext libXdamage libXfixes wine ]);

     

       10
       10
        
       in

     

       11
       11
        
       stdenv.mkDerivation {

     

       12
       12
        
         name = "teamviewer-7.0.9377";

+1 -1

pkgs/applications/office/zotero/firefox-bin/default.nix

···

       125
       125
        
               firefox mozilla-xremote-client firefox-bin plugin-container \

     

       126
       126
        
               updater crashreporter webapprt-stub

     

       127
       127
        
             do

     

       128
       128
       -
               patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \

     

       128
       128
       +
               patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \

     

       129
       129
        
                 "$out/usr/lib/firefox-bin-${version}/$executable"

     

       130
       130
        
             done

     

       131
       131

+2 -2

pkgs/applications/science/electronics/eagle/default.nix

···

       59
       59
        
           gcc -shared -fPIC -DEAGLE_PATH=\"$out/eagle-${version}\" ${./eagle_fixer.c} -o "$out"/lib/eagle_fixer.so -ldl

     

       60
       60
        
       

     

       61
       61
        
           # Make wrapper script

     

       62
       62
       -
           dynlinker="$(cat $NIX_GCC/nix-support/dynamic-linker)"

     

       62
       62
       +
           dynlinker="$(cat $NIX_CC/nix-support/dynamic-linker)"

     

       63
       63
        
           mkdir -p "$out"/bin

     

       64
       64
        
           cat > "$out"/bin/eagle << EOF

     

       65
       65
        
           #!${stdenv.shell}

     

       66
       66
       -
           export LD_LIBRARY_PATH="${stdenv.gcc.gcc}/lib:${libPath}"

     

       66
       66
       +
           export LD_LIBRARY_PATH="${stdenv.cc.gcc}/lib:${libPath}"

     

       67
       67
        
           export LD_PRELOAD="$out/lib/eagle_fixer.so"

     

       68
       68
        
           exec "$dynlinker" "$out/eagle-${version}/bin/eagle" "\$@"

     

       69
       69
        
           EOF

+3 -3

pkgs/applications/science/logic/verifast/default.nix

···

       5
       5
        
       

     

       6
       6
        
       let

     

       7
       7
        
         libPath = stdenv.lib.makeLibraryPath

     

       8
       8
       -
           [ stdenv.gcc.libc stdenv.gcc.gcc gtk gdk_pixbuf atk pango glib cairo

     

       8
       8
       +
           [ stdenv.cc.libc stdenv.cc.gcc gtk gdk_pixbuf atk pango glib cairo

     

       9
       9
        
             freetype fontconfig libxml2 gnome2.gtksourceview

     

       10
       10
       -
           ] + ":${stdenv.gcc.gcc}/lib64";

     

       10
       10
       +
           ] + ":${stdenv.cc.gcc}/lib64";

     

       11
       11
        
       

     

       12
       12
        
         patchExe = x: ''

     

       13
       13
       -
           patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \

     

       13
       13
       +
           patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \

     

       14
       14
        
             --set-rpath ${libPath} ${x}

     

       15
       15
        
         '';

     

       16
       16
        
       in

+1 -1

pkgs/applications/science/logic/yices/default.nix

···

       3
       3
        
       assert stdenv.isLinux;

     

       4
       4
        
       

     

       5
       5
        
       let

     

       6
       6
       -
         libPath = stdenv.lib.makeLibraryPath [ stdenv.gcc.libc ];

     

       6
       6
       +
         libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.libc ];

     

       7
       7
        
       in

     

       8
       8
        
       stdenv.mkDerivation rec {

     

       9
       9
        
         name    = "yices-${version}";

+1 -1

pkgs/applications/science/math/mathematica/9.nix

···

       93
       93
        
             elif [ "$type" == "EXEC" ]; then

     

       94
       94
        
               echo "patching $f executable <<"

     

       95
       95
        
               patchelf \

     

       96
       96
       -
                   --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \

     

       96
       96
       +
                   --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \

     

       97
       97
        
                   --set-rpath "${ldpath}" \

     

       98
       98
        
                   "$f"

     

       99
       99
        
               patchelf --shrink-rpath "$f"

+1 -1

pkgs/applications/science/math/mathematica/default.nix

···

       104
       104
        
               echo "patching $f executable <<"

     

       105
       105
        
               patchelf --shrink-rpath "$f"

     

       106
       106
        
               patchelf \

     

       107
       107
       -
       	  --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \

     

       107
       107
       +
       	  --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \

     

       108
       108
        
                 --set-rpath "$(patchelf --print-rpath "$f"):${ldpath}" \

     

       109
       109
        
                 "$f" \

     

       110
       110
        
                 && patchelf --shrink-rpath "$f" \

+1 -1

pkgs/applications/taxes/aangifte-2006/builder.sh

···

       3
       3
        
       buildPhase() {

     

       4
       4
        
           for i in bin/*; do

     

       5
       5
        
               patchelf \

     

       6
       6
       -
                   --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \

     

       6
       6
       +
                   --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \

     

       7
       7
        
                   --set-rpath $libX11/lib:$libXext/lib \

     

       8
       8
        
                   $i

     

       9
       9
        
           done

+3 -3

pkgs/applications/taxes/aangifte-2007/builder.sh

···

       1
       1
        
       source $stdenv/setup

     

       2
       2
        
       

     

       3
       3
       -
       echo $NIX_GCC

     

       3
       3
       +
       echo $NIX_CC

     

       4
       4
        
       

     

       5
       5
        
       buildPhase() {

     

       6
       6
        
           for i in bin/*; do

     

       7
       7
        
               patchelf \

     

       8
       8
       -
                   --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \

     

       9
       9
       -
                   --set-rpath $libX11/lib:$libXext/lib:$libSM/lib:$(cat $NIX_GCC/nix-support/orig-gcc)/lib \

     

       8
       8
       +
                   --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \

     

       9
       9
       +
                   --set-rpath $libX11/lib:$libXext/lib:$libSM/lib:$(cat $NIX_CC/nix-support/orig-gcc)/lib \

     

       10
       10
        
                   $i

     

       11
       11
        
           done

     

       12
       12
        
       }

+3 -3

pkgs/applications/taxes/aangifte-2008/builder.sh

···

       1
       1
        
       source $stdenv/setup

     

       2
       2
        
       

     

       3
       3
       -
       echo $NIX_GCC

     

       3
       3
       +
       echo $NIX_CC

     

       4
       4
        
       

     

       5
       5
        
       buildPhase() {

     

       6
       6
        
           for i in bin/*; do

     

       7
       7
        
               patchelf \

     

       8
       8
       -
                   --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \

     

       9
       9
       -
                   --set-rpath $libX11/lib:$libXext/lib:$libSM/lib:$(cat $NIX_GCC/nix-support/orig-gcc)/lib \

     

       8
       8
       +
                   --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \

     

       9
       9
       +
                   --set-rpath $libX11/lib:$libXext/lib:$libSM/lib:$(cat $NIX_CC/nix-support/orig-gcc)/lib \

     

       10
       10
        
                   $i

     

       11
       11
        
           done

     

       12
       12
        
       }

+2 -2

pkgs/applications/taxes/aangifte-2009/default.nix

···

       17
       17
        
           ''

     

       18
       18
        
             for i in bin/*; do

     

       19
       19
        
                 patchelf \

     

       20
       20
       -
                     --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \

     

       21
       21
       -
                     --set-rpath ${stdenv.lib.makeLibraryPath [ libX11 libXext libSM ]}:$(cat $NIX_GCC/nix-support/orig-gcc)/lib \

     

       20
       20
       +
                     --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \

     

       21
       21
       +
                     --set-rpath ${stdenv.lib.makeLibraryPath [ libX11 libXext libSM ]}:$(cat $NIX_CC/nix-support/orig-gcc)/lib \

     

       22
       22
        
                     $i

     

       23
       23
        
             done

     

       24
       24
        
           '';

+2 -2

pkgs/applications/taxes/aangifte-2010/default.nix

···

       17
       17
        
           ''

     

       18
       18
        
             for i in bin/*; do

     

       19
       19
        
                 patchelf \

     

       20
       20
       -
                     --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \

     

       21
       21
       -
                     --set-rpath ${stdenv.lib.makeLibraryPath [ libX11 libXext libSM ]}:$(cat $NIX_GCC/nix-support/orig-gcc)/lib \

     

       20
       20
       +
                     --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \

     

       21
       21
       +
                     --set-rpath ${stdenv.lib.makeLibraryPath [ libX11 libXext libSM ]}:$(cat $NIX_CC/nix-support/orig-gcc)/lib \

     

       22
       22
        
                     $i

     

       23
       23
        
             done

     

       24
       24
        
           '';

+2 -2

pkgs/applications/taxes/aangifte-2011/default.nix

···

       17
       17
        
           ''

     

       18
       18
        
             for i in bin/*; do

     

       19
       19
        
                 patchelf \

     

       20
       20
       -
                     --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \

     

       21
       21
       -
                     --set-rpath ${stdenv.lib.makeLibraryPath [ libX11 libXext libSM ]}:$(cat $NIX_GCC/nix-support/orig-gcc)/lib \

     

       20
       20
       +
                     --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \

     

       21
       21
       +
                     --set-rpath ${stdenv.lib.makeLibraryPath [ libX11 libXext libSM ]}:$(cat $NIX_CC/nix-support/orig-gcc)/lib \

     

       22
       22
        
                     $i

     

       23
       23
        
             done

     

       24
       24
        
           '';

+3 -3

pkgs/applications/taxes/aangifte-2012/default.nix

···

       17
       17
        
           ''

     

       18
       18
        
             for i in bin/*; do

     

       19
       19
        
                 patchelf \

     

       20
       20
       -
                     --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \

     

       21
       21
       -
                     --set-rpath ${stdenv.lib.makeLibraryPath [ libX11 libXext libSM ]}:$(cat $NIX_GCC/nix-support/orig-gcc)/lib \

     

       20
       20
       +
                     --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \

     

       21
       21
       +
                     --set-rpath ${stdenv.lib.makeLibraryPath [ libX11 libXext libSM ]}:$(cat $NIX_CC/nix-support/orig-gcc)/lib \

     

       22
       22
        
                     $i

     

       23
       23
        
             done

     

       24
       24
        
           '';

     
···

       28
       28
        
             mkdir -p $out

     

       29
       29
        
             cp -prvd * $out/

     

       30
       30
        
             wrapProgram $out/bin/ib2012ux --prefix PATH : ${xdg_utils}/bin \

     

       31
       31
       -
                                           --prefix LD_PRELOAD : $(cat $NIX_GCC/nix-support/orig-gcc)/lib/libgcc_s.so.1

     

       31
       31
       +
                                           --prefix LD_PRELOAD : $(cat $NIX_CC/nix-support/orig-gcc)/lib/libgcc_s.so.1

     

       32
       32
        
           '';

     

       33
       33
        
       

     

       34
       34
        
         meta = {

+3 -3

pkgs/applications/taxes/aangifte-2013/default.nix

···

       17
       17
        
           ''

     

       18
       18
        
             for i in bin/*; do

     

       19
       19
        
                 patchelf \

     

       20
       20
       -
                     --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \

     

       21
       21
       -
                     --set-rpath ${stdenv.lib.makeLibraryPath [ libX11 libXext libSM ]}:$(cat $NIX_GCC/nix-support/orig-gcc)/lib \

     

       20
       20
       +
                     --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \

     

       21
       21
       +
                     --set-rpath ${stdenv.lib.makeLibraryPath [ libX11 libXext libSM ]}:$(cat $NIX_CC/nix-support/orig-gcc)/lib \

     

       22
       22
        
                     $i

     

       23
       23
        
             done

     

       24
       24
        
           '';

     
···

       28
       28
        
             mkdir -p $out

     

       29
       29
        
             cp -prvd * $out/

     

       30
       30
        
             wrapProgram $out/bin/ib2013ux --prefix PATH : ${xdg_utils}/bin \

     

       31
       31
       -
                                           --prefix LD_PRELOAD : $(cat $NIX_GCC/nix-support/orig-gcc)/lib/libgcc_s.so.1

     

       31
       31
       +
                                           --prefix LD_PRELOAD : $(cat $NIX_CC/nix-support/orig-gcc)/lib/libgcc_s.so.1

     

       32
       32
        
           '';

     

       33
       33
        
       

     

       34
       34
        
         meta = {

+1 -1

pkgs/applications/video/makemkv/builder.sh

···

       27
       27
        
       

     

       28
       28
        
       for i in ${bin} ; do

     

       29
       29
        
         patchelf \

     

       30
       30
       -
           --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \

     

       30
       30
       +
           --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \

     

       31
       31
        
           --set-rpath $libPath \

     

       32
       32
        
           ${i}

     

       33
       33
        
       done

+2 -2

pkgs/applications/video/makemkv/default.nix

···

       19
       19
        
       

     

       20
       20
        
         buildInputs = [openssl qt4 mesa zlib pkgconfig libav];

     

       21
       21
        
       

     

       22
       22
       -
         libPath = stdenv.lib.makeLibraryPath [stdenv.gcc.gcc openssl mesa qt4 zlib ] 

     

       23
       23
       -
                 + ":" + stdenv.gcc.gcc + "/lib64";

     

       22
       22
       +
         libPath = stdenv.lib.makeLibraryPath [stdenv.cc.gcc openssl mesa qt4 zlib ] 

     

       23
       23
       +
                 + ":" + stdenv.cc.gcc + "/lib64";

     

       24
       24
        
       

     

       25
       25
        
         meta = with stdenv.lib; {

     

       26
       26
        
           description = "convert blu-ray and dvd to mkv";

+1 -1

pkgs/applications/virtualization/virtualbox/guest-additions/default.nix

···

       70
       70
        
               ''

     

       71
       71
        
               else throw ("Architecture: "+stdenv.system+" not supported for VirtualBox guest additions")

     

       72
       72
        
               }

     

       73
       73
       -
               patchelf --set-rpath ${stdenv.gcc.gcc}/lib:${dbus}/lib:${libX11}/lib:${libXt}/lib:${libXext}/lib:${libXmu}/lib:${libXfixes}/lib:${libXrandr}/lib:${libXcursor}/lib $i

     

       73
       73
       +
               patchelf --set-rpath ${stdenv.cc.gcc}/lib:${dbus}/lib:${libX11}/lib:${libXt}/lib:${libXext}/lib:${libXmu}/lib:${libXfixes}/lib:${libXrandr}/lib:${libXcursor}/lib $i

     

       74
       74
        
           done

     

       75
       75
        
       

     

       76
       76
        
           for i in lib/VBoxOGL*.so

+3 -3

pkgs/build-support/builder-defs/builder-defs.nix

···

       100
       100
        
                       ${stdenv.preHook}

     

       101
       101
        
                       

     

       102
       102
        
                       set -e

     

       103
       103
       -
                       NIX_GCC=${stdenv.gcc}

     

       103
       103
       +
                       NIX_CC=${stdenv.cc}

     

       104
       104
        
                       export SHELL=${stdenv.shell}

     

       105
       105
        
                       PATH_DELIMITER=':'

     

       106
       106
        
                       

     

       107
       107
        
                       # Set up the initial path.

     

       108
       108
        
                       PATH=

     

       109
       109
       -
                       for i in \$NIX_GCC ${toString stdenv.initialPath}; do

     

       109
       109
       +
                       for i in \$NIX_CC ${toString stdenv.initialPath}; do

     

       110
       110
        
                           PATH=\$PATH\${PATH:+\"\${PATH_DELIMITER}\"}\$i/bin

     

       111
       111
        
                       done

     

       112
       112
        
       

     
···

       138
       138
        
                       }

     

       139
       139
        
       

     

       140
       140
        
                       pkgs=\"\"

     

       141
       141
       -
                       for i in \$NIX_GCC ${toString realBuildInputs}; do

     

       141
       141
       +
                       for i in \$NIX_CC ${toString realBuildInputs}; do

     

       142
       142
        
                           findInputs \$i

     

       143
       143
        
                       done

     

       144
       144

+2

pkgs/build-support/cabal/default.nix

···

       220
       220
        
                       done

     

       221
       221
        
                     done

     

       222
       222
        
       

     

       223
       223
       +
                     configureFlags+=" --with-gcc=$CC"

     

       224
       224
       +
       

     

       223
       225
        
                     ${optionalString (self.enableSharedExecutables && self.stdenv.isLinux) ''

     

       224
       226
        
                       configureFlags+=" --ghc-option=-optl=-Wl,-rpath=$out/lib/${ghc.ghc.name}/${self.pname}-${self.version}"

     

       225
       227
        
                     ''}

+4 -4

pkgs/build-support/gcc-cross-wrapper/gcc-wrapper.sh

···

       1
       1
        
       #! @shell@ -e

     

       2
       2
        
       

     

       3
       3
       -
       if test -n "$NIX_GCC_WRAPPER_START_HOOK"; then

     

       4
       4
       -
           source "$NIX_GCC_WRAPPER_START_HOOK"

     

       3
       3
       +
       if test -n "$NIX_CC_WRAPPER_START_HOOK"; then

     

       4
       4
       +
           source "$NIX_CC_WRAPPER_START_HOOK"

     

       5
       5
        
       fi

     

       6
       6
        
       

     

       7
       7
        
       if test -z "$NIX_CROSS_GLIBC_FLAGS_SET"; then

     
···

       107
       107
        
         done

     

       108
       108
        
       fi

     

       109
       109
        
       

     

       110
       110
       -
       if test -n "$NIX_GCC_WRAPPER_EXEC_HOOK"; then

     

       111
       111
       -
           source "$NIX_GCC_WRAPPER_EXEC_HOOK"

     

       110
       110
       +
       if test -n "$NIX_CC_WRAPPER_EXEC_HOOK"; then

     

       111
       111
       +
           source "$NIX_CC_WRAPPER_EXEC_HOOK"

     

       112
       112
        
       fi

     

       113
       113
        
       

     

       114
       114
        
       # We want gcc to call the wrapper linker, not that of binutils.

+1 -1

pkgs/build-support/gcc-wrapper-old/add-flags

···

       25
       25
        
           export NIX_LDFLAGS_BEFORE="$(cat @out@/nix-support/libc-ldflags-before) $NIX_LDFLAGS_BEFORE"

     

       26
       26
        
       fi

     

       27
       27
        
       

     

       28
       28
       -
       export NIX_GCC_WRAPPER_FLAGS_SET=1

     

       28
       28
       +
       export NIX_CC_WRAPPER_FLAGS_SET=1

+5 -5

pkgs/build-support/gcc-wrapper-old/gcc-wrapper-old.sh

···

       1
       1
        
       #! @shell@ -e

     

       2
       2
        
       

     

       3
       3
       -
       if [ -n "$NIX_GCC_WRAPPER_START_HOOK" ]; then

     

       4
       4
       -
           source "$NIX_GCC_WRAPPER_START_HOOK"

     

       3
       3
       +
       if [ -n "$NIX_CC_WRAPPER_START_HOOK" ]; then

     

       4
       4
       +
           source "$NIX_CC_WRAPPER_START_HOOK"

     

       5
       5
        
       fi

     

       6
       6
        
       

     

       7
       7
       -
       if [ -z "$NIX_GCC_WRAPPER_FLAGS_SET" ]; then

     

       7
       7
       +
       if [ -z "$NIX_CC_WRAPPER_FLAGS_SET" ]; then

     

       8
       8
        
           source @out@/nix-support/add-flags.sh

     

       9
       9
        
       fi

     

       10
       10
        
       

     
···

       139
       139
        
         done

     

       140
       140
        
       fi

     

       141
       141
        
       

     

       142
       142
       -
       if [ -n "$NIX_GCC_WRAPPER_EXEC_HOOK" ]; then

     

       143
       143
       -
           source "$NIX_GCC_WRAPPER_EXEC_HOOK"

     

       142
       142
       +
       if [ -n "$NIX_CC_WRAPPER_EXEC_HOOK" ]; then

     

       143
       143
       +
           source "$NIX_CC_WRAPPER_EXEC_HOOK"

     

       144
       144
        
       fi

     

       145
       145
        
       

     

       146
       146
        
       exec @prog@ ${extraBefore[@]} "${params[@]}" "${extraAfter[@]}"

+6 -6

pkgs/build-support/gcc-wrapper-old/gcc-wrapper.sh

···

       1
       1
        
       #! @shell@ -e

     

       2
       2
        
       

     

       3
       3
       -
       if test -n "$NIX_GCC_WRAPPER_START_HOOK"; then

     

       4
       4
       -
           source "$NIX_GCC_WRAPPER_START_HOOK"

     

       3
       3
       +
       if test -n "$NIX_CC_WRAPPER_START_HOOK"; then

     

       4
       4
       +
           source "$NIX_CC_WRAPPER_START_HOOK"

     

       5
       5
        
       fi

     

       6
       6
        
       

     

       7
       7
       -
       if test -z "$NIX_GCC_WRAPPER_FLAGS_SET"; then

     

       7
       7
       +
       if test -z "$NIX_CC_WRAPPER_FLAGS_SET"; then

     

       8
       8
        
           source @out@/nix-support/add-flags.sh

     

       9
       9
        
       fi

     

       10
       10
        
       

     
···

       130
       130
        
         done

     

       131
       131
        
       fi

     

       132
       132
        
       

     

       133
       133
       -
       if test -n "$NIX_GCC_WRAPPER_EXEC_HOOK"; then

     

       134
       134
       -
           source "$NIX_GCC_WRAPPER_EXEC_HOOK"

     

       133
       133
       +
       if test -n "$NIX_CC_WRAPPER_EXEC_HOOK"; then

     

       134
       134
       +
           source "$NIX_CC_WRAPPER_EXEC_HOOK"

     

       135
       135
        
       fi

     

       136
       136
        
       

     

       137
       137
        
       

     

       138
       138
        
       # Call the real `gcc'.  Filter out warnings from stderr about unused

     

       139
       139
        
       # `-B' flags, since they confuse some programs.  Deep bash magic to

     

       140
       140
        
       # apply grep to stderr (by swapping stdin/stderr twice).

     

       141
       141
       -
       if test -z "$NIX_GCC_NEEDS_GREP"; then

     

       141
       141
       +
       if test -z "$NIX_CC_NEEDS_GREP"; then

     

       142
       142
        
           @gccProg@ ${extraBefore[@]} "${params[@]}" ${extraAfter[@]}

     

       143
       143
        
       else

     

       144
       144
        
           (@gccProg@ ${extraBefore[@]} "${params[@]}" ${extraAfter[@]} 3>&2 2>&1 1>&3- \

+1 -1

pkgs/build-support/gcc-wrapper-old/ld-wrapper.sh

···

       4
       4
        
           source "$NIX_LD_WRAPPER_START_HOOK"

     

       5
       5
        
       fi

     

       6
       6
        
       

     

       7
       7
       -
       if test -z "$NIX_GCC_WRAPPER_FLAGS_SET"; then

     

       7
       7
       +
       if test -z "$NIX_CC_WRAPPER_FLAGS_SET"; then

     

       8
       8
        
           source @out@/nix-support/add-flags.sh

     

       9
       9
        
       fi

     

       10
       10

+1 -1

pkgs/build-support/gcc-wrapper/add-flags

···

       25
       25
        
           export NIX_LDFLAGS_BEFORE="$(cat @out@/nix-support/libc-ldflags-before) $NIX_LDFLAGS_BEFORE"

     

       26
       26
        
       fi

     

       27
       27
        
       

     

       28
       28
       -
       export NIX_GCC_WRAPPER_FLAGS_SET=1

     

       28
       28
       +
       export NIX_CC_WRAPPER_FLAGS_SET=1

+1 -1

pkgs/build-support/gcc-wrapper/default.nix

···

       226
       226
        
       

     

       227
       227
        
         crossAttrs = {

     

       228
       228
        
           shell = shell.crossDrv + shell.crossDrv.shellPath;

     

       229
       229
       -
           libc = stdenv.gccCross.libc;

     

       229
       229
       +
           libc = stdenv.ccCross.libc;

     

       230
       230
        
           coreutils = coreutils.crossDrv;

     

       231
       231
        
           binutils = binutils.crossDrv;

     

       232
       232
        
           gcc = gcc.crossDrv;

+5 -5

pkgs/build-support/gcc-wrapper/gcc-wrapper.sh

···

       1
       1
        
       #! @shell@ -e

     

       2
       2
        
       

     

       3
       3
       -
       if [ -n "$NIX_GCC_WRAPPER_START_HOOK" ]; then

     

       4
       4
       -
           source "$NIX_GCC_WRAPPER_START_HOOK"

     

       3
       3
       +
       if [ -n "$NIX_CC_WRAPPER_START_HOOK" ]; then

     

       4
       4
       +
           source "$NIX_CC_WRAPPER_START_HOOK"

     

       5
       5
        
       fi

     

       6
       6
        
       

     

       7
       7
       -
       if [ -z "$NIX_GCC_WRAPPER_FLAGS_SET" ]; then

     

       7
       7
       +
       if [ -z "$NIX_CC_WRAPPER_FLAGS_SET" ]; then

     

       8
       8
        
           source @out@/nix-support/add-flags.sh

     

       9
       9
        
       fi

     

       10
       10
        
       

     
···

       139
       139
        
         done

     

       140
       140
        
       fi

     

       141
       141
        
       

     

       142
       142
       -
       if [ -n "$NIX_GCC_WRAPPER_EXEC_HOOK" ]; then

     

       143
       143
       -
           source "$NIX_GCC_WRAPPER_EXEC_HOOK"

     

       142
       142
       +
       if [ -n "$NIX_CC_WRAPPER_EXEC_HOOK" ]; then

     

       143
       143
       +
           source "$NIX_CC_WRAPPER_EXEC_HOOK"

     

       144
       144
        
       fi

     

       145
       145
        
       

     

       146
       146
        
       exec @prog@ ${extraBefore[@]} "${params[@]}" "${extraAfter[@]}"

+1 -1

pkgs/build-support/gcc-wrapper/ld-wrapper.sh

···

       4
       4
        
           source "$NIX_LD_WRAPPER_START_HOOK"

     

       5
       5
        
       fi

     

       6
       6
        
       

     

       7
       7
       -
       if [ -z "$NIX_GCC_WRAPPER_FLAGS_SET" ]; then

     

       7
       7
       +
       if [ -z "$NIX_CC_WRAPPER_FLAGS_SET" ]; then

     

       8
       8
        
           source @out@/nix-support/add-flags.sh

     

       9
       9
        
       fi

     

       10
       10

+4 -1

pkgs/build-support/gcc-wrapper/setup-hook.sh

···

       1
       1
       -
       export NIX_GCC=@out@

     

       1
       1
       +
       export NIX_CC=@out@

     

       2
       2
        
       

     

       3
       3
        
       addCVars () {

     

       4
       4
        
           if [ -d $1/include ]; then

     
···

       33
       33
        
       if [ -n "@coreutils@" ]; then

     

       34
       34
        
           addToSearchPath PATH @coreutils@/bin

     

       35
       35
        
       fi

     

       36
       36
       +
       

     

       37
       37
       +
       export CC=gcc

     

       38
       38
       +
       export CXX=g++

+2 -2

pkgs/development/arduino/arduino-core/default.nix

···

       36
       36
        
                   if echo "$filepath" | grep -q "\.elf$"; then

     

       37
       37
        
                       continue

     

       38
       38
        
                   fi

     

       39
       39
       -
                   echo "setting interpreter $(cat "$NIX_GCC"/nix-support/dynamic-linker) in $filepath"

     

       40
       40
       -
                   patchelf --set-interpreter "$(cat "$NIX_GCC"/nix-support/dynamic-linker)" "$filepath"

     

       39
       39
       +
                   echo "setting interpreter $(cat "$NIX_CC"/nix-support/dynamic-linker) in $filepath"

     

       40
       40
       +
                   patchelf --set-interpreter "$(cat "$NIX_CC"/nix-support/dynamic-linker)" "$filepath"

     

       41
       41
        
                   test $? -eq 0 || { echo "patchelf failed to process $filepath"; exit 1; }

     

       42
       42
        
               fi

     

       43
       43
        
           done

+1 -1

pkgs/development/compilers/aldor/default.nix

···

       23
       23
        
           do

     

       24
       24
        
             wrapProgram $out/bin/$prog --set ALDORROOT $out \

     

       25
       25
        
               --prefix PATH : ${openjdk}/bin \

     

       26
       26
       -
               --prefix PATH : ${stdenv.gcc}/bin ;

     

       26
       26
       +
               --prefix PATH : ${stdenv.cc}/bin ;

     

       27
       27
        
           done

     

       28
       28
        
         '';

     

       29
       29

+1 -1

pkgs/development/compilers/bigloo/default.nix

···

       13
       13
        
       

     

       14
       14
        
         preConfigure =

     

       15
       15
        
           # Help libgc's configure.

     

       16
       16
       -
           '' export CXXCPP="g++ -E"

     

       16
       16
       +
           '' export CXXCPP="$CXX -E"

     

       17
       17
        
           '';

     

       18
       18
        
       

     

       19
       19
        
         patchPhase = ''

+1 -1

pkgs/development/compilers/cmucl/binary.nix

···

       24
       24
        
         buildCommand = ''

     

       25
       25
        
           mkdir -p $out

     

       26
       26
        
           tar -C $out -xjf ${dist}

     

       27
       27
       -
           patchelf --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \

     

       27
       27
       +
           patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \

     

       28
       28
        
             $out/bin/lisp

     

       29
       29
        
         '';

     

       30
       30

+5 -2

pkgs/development/compilers/compcert/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, coq, ocaml, ocamlPackages, gcc }:

     

       1
       1
       +
       { stdenv, fetchurl, coq, ocaml, ocamlPackages }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         name    = "compcert-${version}";

     
···

       12
       12
        
         buildInputs = [ coq ocaml ocamlPackages.menhir ];

     

       13
       13
        
       

     

       14
       14
        
         enableParallelBuilding = true;

     

       15
       15
       -
         configurePhase = "./configure -prefix $out -toolprefix ${gcc}/bin/ " +

     

       15
       15
       +
       

     

       16
       16
       +
         configurePhase = ''

     

       17
       17
       +
           substituteInPlace ./configure --replace '{toolprefix}gcc' '{toolprefix}cc'

     

       18
       18
       +
           ./configure -prefix $out -toolprefix ${stdenv.cc}/bin/ '' +

     

       16
       19
        
           (if stdenv.isDarwin then "ia32-macosx" else "ia32-linux");

     

       17
       20
        
       

     

       18
       21
        
         meta = with stdenv.lib; {

+5 -5

pkgs/development/compilers/cryptol/1.8.x.nix

···

       10
       10
        
         jss-ver = "jss-0.4";

     

       11
       11
        
       

     

       12
       12
        
         libPath = stdenv.lib.makeLibraryPath

     

       13
       13
       -
           [ stdenv.gcc.libc

     

       14
       14
       -
             stdenv.gcc.gcc

     

       13
       13
       +
           [ stdenv.cc.libc

     

       14
       14
       +
             stdenv.cc.gcc

     

       15
       15
        
             gmp4

     

       16
       16
        
             ncurses

     

       17
       17
        
             zlib

     

       18
       18
       -
           ] + ":${stdenv.gcc.gcc}/lib64";

     

       18
       18
       +
           ] + ":${stdenv.cc.gcc}/lib64";

     

       19
       19
        
       

     

       20
       20
        
         cryptol-bin =

     

       21
       21
        
           if stdenv.system == "i686-linux"

     
···

       94
       94
        
       

     

       95
       95
        
           # Hack around lack of libtinfo in NixOS

     

       96
       96
        
           ln -s ${ncurses}/lib/libncursesw.so.5.9 $out/lib/libtinfo.so.5

     

       97
       97
       -
           ln -s ${stdenv.gcc.libc}/lib/libpthread-2.19.so $out/lib/libpthread.so.0

     

       97
       97
       +
           ln -s ${stdenv.cc.libc}/lib/libpthread-2.19.so $out/lib/libpthread.so.0

     

       98
       98
        
         '';

     

       99
       99
        
       

     

       100
       100
        
         fixupPhase = ''

     

       101
       101
        
           for x in bin/cryptol bin/edif2verilog bin/copy-iverilog bin/symbolic_netlist bin/jaig bin/vvp-galois bin/lss libexec/jss; do

     

       102
       102
       -
             patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \

     

       102
       102
       +
             patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \

     

       103
       103
        
               --set-rpath "$out/lib:${libPath}" $out/$x

     

       104
       104
        
             patchelf --shrink-rpath $out/$x

     

       105
       105
        
           done

+3 -3

pkgs/development/compilers/cudatoolkit/5.5.nix

···

       26
       26
        
           gtk2 glib fontconfig freetype unixODBC alsaLib

     

       27
       27
        
         ];

     

       28
       28
        
       

     

       29
       29
       -
         rpath = "${stdenv.lib.makeLibraryPath runtimeDependencies}:${stdenv.gcc.gcc}/lib64";

     

       29
       29
       +
         rpath = "${stdenv.lib.makeLibraryPath runtimeDependencies}:${stdenv.cc.gcc}/lib64";

     

       30
       30
        
       

     

       31
       31
        
         unpackPhase = ''

     

       32
       32
        
           sh $src --keep --noexec

     
···

       38
       38
        
       

     

       39
       39
        
         buildPhase = ''

     

       40
       40
        
           find . -type f -executable -exec patchelf \

     

       41
       41
       -
             --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \

     

       41
       41
       +
             --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \

     

       42
       42
        
             '{}' \; || true

     

       43
       43
        
           find . -type f -exec patchelf \

     

       44
       44
       -
             --set-rpath $rpath:$out/jre/lib/amd64/jli:$out/lib:$out/lib64:$out/nvvm/lib:$out/nvvm/lib64:$(cat $NIX_GCC/nix-support/orig-gcc)/lib \

     

       44
       44
       +
             --set-rpath $rpath:$out/jre/lib/amd64/jli:$out/lib:$out/lib64:$out/nvvm/lib:$out/nvvm/lib64:$(cat $NIX_CC/nix-support/orig-gcc)/lib \

     

       45
       45
        
             --force-rpath \

     

       46
       46
        
             '{}' \; || true

     

       47
       47
        
         '';

+3 -3

pkgs/development/compilers/cudatoolkit/6.0.nix

···

       26
       26
        
           gtk2 glib fontconfig freetype unixODBC alsaLib

     

       27
       27
        
         ];

     

       28
       28
        
       

     

       29
       29
       -
         rpath = "${stdenv.lib.makeLibraryPath runtimeDependencies}:${stdenv.gcc.gcc}/lib64";

     

       29
       29
       +
         rpath = "${stdenv.lib.makeLibraryPath runtimeDependencies}:${stdenv.cc.gcc}/lib64";

     

       30
       30
        
       

     

       31
       31
        
         unpackPhase = ''

     

       32
       32
        
           sh $src --keep --noexec

     
···

       38
       38
        
       

     

       39
       39
        
         buildPhase = ''

     

       40
       40
        
           find . -type f -executable -exec patchelf \

     

       41
       41
       -
             --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \

     

       41
       41
       +
             --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \

     

       42
       42
        
             '{}' \; || true

     

       43
       43
        
           find . -type f -exec patchelf \

     

       44
       44
       -
             --set-rpath $rpath:$out/jre/lib/amd64/jli:$out/lib:$out/lib64:$out/nvvm/lib:$out/nvvm/lib64:$(cat $NIX_GCC/nix-support/orig-gcc)/lib \

     

       44
       44
       +
             --set-rpath $rpath:$out/jre/lib/amd64/jli:$out/lib:$out/lib64:$out/nvvm/lib:$out/nvvm/lib64:$(cat $NIX_CC/nix-support/orig-gcc)/lib \

     

       45
       45
        
             --force-rpath \

     

       46
       46
        
             '{}' \; || true

     

       47
       47
        
         '';

+1 -1

pkgs/development/compilers/fpc/lazarus.nix

···

       17
       17
        
         buildInputs = [

     

       18
       18
        
           fpc gtk glib libXi inputproto

     

       19
       19
        
           libX11 xproto libXext xextproto pango atk

     

       20
       20
       -
           stdenv.gcc makeWrapper gdk_pixbuf

     

       20
       20
       +
           stdenv.cc makeWrapper gdk_pixbuf

     

       21
       21
        
         ];

     

       22
       22
        
       in

     

       23
       23
        
       stdenv.mkDerivation {

+4 -4

pkgs/development/compilers/gcc/3.4/builder.sh

···

       7
       7
        
       

     

       8
       8
        
       if test "$noSysDirs" = "1"; then

     

       9
       9
        
       

     

       10
       10
       -
           if test -e $NIX_GCC/nix-support/orig-libc; then

     

       10
       10
       +
           if test -e $NIX_CC/nix-support/orig-libc; then

     

       11
       11
        
       

     

       12
       12
        
               # Figure out what extra flags to pass to the gcc compilers

     

       13
       13
        
               # being generated to make sure that they use our glibc.

     

       14
       14
       -
               extraCFlags="$(cat $NIX_GCC/nix-support/libc-cflags)"

     

       15
       15
       -
               extraLDFlags="$(cat $NIX_GCC/nix-support/libc-ldflags) $(cat $NIX_GCC/nix-support/libc-ldflags-before)"

     

       14
       14
       +
               extraCFlags="$(cat $NIX_CC/nix-support/libc-cflags)"

     

       15
       15
       +
               extraLDFlags="$(cat $NIX_CC/nix-support/libc-ldflags) $(cat $NIX_CC/nix-support/libc-ldflags-before)"

     

       16
       16
        
       

     

       17
       17
        
               # Use *real* header files, otherwise a limits.h is generated

     

       18
       18
        
               # that does not include Glibc's limits.h (notably missing

     

       19
       19
        
               # SSIZE_MAX, which breaks the build).

     

       20
       20
       -
               export NIX_FIXINC_DUMMY=$(cat $NIX_GCC/nix-support/orig-libc)/include

     

       20
       20
       +
               export NIX_FIXINC_DUMMY=$(cat $NIX_CC/nix-support/orig-libc)/include

     

       21
       21
        
               

     

       22
       22
        
           else

     

       23
       23
        
               # Hack: support impure environments.

+3 -3

pkgs/development/compilers/gcc/4.2-apple64/builder.sh

···

       14
       14
        
       

     

       15
       15
        
           # Figure out what extra flags to pass to the gcc compilers being

     

       16
       16
        
           # generated to make sure that they use our glibc.

     

       17
       17
       -
           if test -e $NIX_GCC/nix-support/orig-glibc; then

     

       18
       18
       -
               glibc=$(cat $NIX_GCC/nix-support/orig-glibc)

     

       17
       17
       +
           if test -e $NIX_CC/nix-support/orig-glibc; then

     

       18
       18
       +
               glibc=$(cat $NIX_CC/nix-support/orig-glibc)

     

       19
       19
        
       

     

       20
       20
        
               # Ugh.  Copied from gcc-wrapper/builder.sh.  We can't just

     

       21
       21
       -
               # source in $NIX_GCC/nix-support/add-flags, since that would

     

       21
       21
       +
               # source in $NIX_CC/nix-support/add-flags, since that would

     

       22
       22
        
               # cause *this* GCC to be linked against the *previous* GCC.

     

       23
       23
        
               # Need some more modularity there.

     

       24
       24
        
               extraCFlags="-B$glibc/lib -isystem $glibc/include"

+4 -4

pkgs/development/compilers/gcc/4.3/builder.sh

···

       12
       12
        
       

     

       13
       13
        
       if test "$noSysDirs" = "1"; then

     

       14
       14
        
       

     

       15
       15
       -
           if test -e $NIX_GCC/nix-support/orig-libc; then

     

       15
       15
       +
           if test -e $NIX_CC/nix-support/orig-libc; then

     

       16
       16
        
       

     

       17
       17
        
               # Figure out what extra flags to pass to the gcc compilers

     

       18
       18
        
               # being generated to make sure that they use our glibc.

     

       19
       19
       -
               extraCFlags="$(cat $NIX_GCC/nix-support/libc-cflags)"

     

       20
       20
       -
               extraLDFlags="$(cat $NIX_GCC/nix-support/libc-ldflags) $(cat $NIX_GCC/nix-support/libc-ldflags-before)"

     

       19
       19
       +
               extraCFlags="$(cat $NIX_CC/nix-support/libc-cflags)"

     

       20
       20
       +
               extraLDFlags="$(cat $NIX_CC/nix-support/libc-ldflags) $(cat $NIX_CC/nix-support/libc-ldflags-before)"

     

       21
       21
        
       

     

       22
       22
        
               # Use *real* header files, otherwise a limits.h is generated

     

       23
       23
        
               # that does not include Glibc's limits.h (notably missing

     

       24
       24
        
               # SSIZE_MAX, which breaks the build).

     

       25
       25
       -
               export NIX_FIXINC_DUMMY=$(cat $NIX_GCC/nix-support/orig-libc)/include

     

       25
       25
       +
               export NIX_FIXINC_DUMMY=$(cat $NIX_CC/nix-support/orig-libc)/include

     

       26
       26
        
               

     

       27
       27
        
           else

     

       28
       28
        
               # Hack: support impure environments.

+11 -11

pkgs/development/compilers/gcc/4.4/builder.sh

···

       17
       17
        
       

     

       18
       18
        
       if test "$noSysDirs" = "1"; then

     

       19
       19
        
       

     

       20
       20
       -
           if test -e $NIX_GCC/nix-support/orig-libc; then

     

       20
       20
       +
           if test -e $NIX_CC/nix-support/orig-libc; then

     

       21
       21
        
       

     

       22
       22
        
               # Figure out what extra flags to pass to the gcc compilers

     

       23
       23
        
               # being generated to make sure that they use our glibc.

     

       24
       24
       -
               extraFlags="$(cat $NIX_GCC/nix-support/libc-cflags)"

     

       25
       25
       -
               extraLDFlags="$(cat $NIX_GCC/nix-support/libc-ldflags) $(cat $NIX_GCC/nix-support/libc-ldflags-before)"

     

       24
       24
       +
               extraFlags="$(cat $NIX_CC/nix-support/libc-cflags)"

     

       25
       25
       +
               extraLDFlags="$(cat $NIX_CC/nix-support/libc-ldflags) $(cat $NIX_CC/nix-support/libc-ldflags-before)"

     

       26
       26
        
       

     

       27
       27
        
               # Use *real* header files, otherwise a limits.h is generated

     

       28
       28
        
               # that does not include Glibc's limits.h (notably missing

     

       29
       29
        
               # SSIZE_MAX, which breaks the build).

     

       30
       30
       -
               export NIX_FIXINC_DUMMY=$(cat $NIX_GCC/nix-support/orig-libc)/include

     

       30
       30
       +
               export NIX_FIXINC_DUMMY=$(cat $NIX_CC/nix-support/orig-libc)/include

     

       31
       31
        
       

     

       32
       32
        
               # The path to the Glibc binaries such as `crti.o'.

     

       33
       33
       -
               glibc_libdir="$(cat $NIX_GCC/nix-support/orig-libc)/lib"

     

       33
       33
       +
               glibc_libdir="$(cat $NIX_CC/nix-support/orig-libc)/lib"

     

       34
       34
        
               

     

       35
       35
        
           else

     

       36
       36
        
               # Hack: support impure environments.

     
···

       61
       61
        
                   EXTRA_LDFLAGS_TARGET="-Wl,-L${libcCross}/lib"

     

       62
       62
        
               fi

     

       63
       63
        
           else

     

       64
       64
       -
               if test -z "$NIX_GCC_CROSS"; then

     

       64
       64
       +
               if test -z "$NIX_CC_CROSS"; then

     

       65
       65
        
                   EXTRA_FLAGS_TARGET="$EXTRA_FLAGS"

     

       66
       66
        
                   EXTRA_LDFLAGS_TARGET="$EXTRA_LDFLAGS"

     

       67
       67
        
               else

     

       68
       68
        
                   # This the case of cross-building the gcc.

     

       69
       69
        
                   # We need special flags for the target, different than those of the build

     

       70
       70
        
                   # Assertion:

     

       71
       71
       -
                   test -e $NIX_GCC_CROSS/nix-support/orig-libc

     

       71
       71
       +
                   test -e $NIX_CC_CROSS/nix-support/orig-libc

     

       72
       72
        
       

     

       73
       73
        
                   # Figure out what extra flags to pass to the gcc compilers

     

       74
       74
        
                   # being generated to make sure that they use our glibc.

     

       75
       75
       -
                   extraFlags="$(cat $NIX_GCC_CROSS/nix-support/libc-cflags)"

     

       76
       76
       -
                   extraLDFlags="$(cat $NIX_GCC_CROSS/nix-support/libc-ldflags) $(cat $NIX_GCC_CROSS/nix-support/libc-ldflags-before)"

     

       75
       75
       +
                   extraFlags="$(cat $NIX_CC_CROSS/nix-support/libc-cflags)"

     

       76
       76
       +
                   extraLDFlags="$(cat $NIX_CC_CROSS/nix-support/libc-ldflags) $(cat $NIX_CC_CROSS/nix-support/libc-ldflags-before)"

     

       77
       77
        
       

     

       78
       78
        
                   # Use *real* header files, otherwise a limits.h is generated

     

       79
       79
        
                   # that does not include Glibc's limits.h (notably missing

     

       80
       80
        
                   # SSIZE_MAX, which breaks the build).

     

       81
       81
       -
                   NIX_FIXINC_DUMMY_CROSS=$(cat $NIX_GCC_CROSS/nix-support/orig-libc)/include

     

       81
       81
       +
                   NIX_FIXINC_DUMMY_CROSS=$(cat $NIX_CC_CROSS/nix-support/orig-libc)/include

     

       82
       82
        
       

     

       83
       83
        
                   # The path to the Glibc binaries such as `crti.o'.

     

       84
       84
       -
                   glibc_libdir="$(cat $NIX_GCC_CROSS/nix-support/orig-libc)/lib"

     

       84
       84
       +
                   glibc_libdir="$(cat $NIX_CC_CROSS/nix-support/orig-libc)/lib"

     

       85
       85
        
       

     

       86
       86
        
                   extraFlags="-g0 -O2 -I$NIX_FIXINC_DUMMY_CROSS $extraFlags"

     

       87
       87
        
                   extraLDFlags="--strip-debug -L$glibc_libdir -rpath $glibc_libdir $extraLDFlags"

+1 -1

pkgs/development/compilers/gcc/4.4/default.nix

···

       188
       188
        
           NM_FOR_TARGET = "${stdenv.cross.config}-nm";

     

       189
       189
        
           CXX_FOR_TARGET = "${stdenv.cross.config}-g++";

     

       190
       190
        
           # If we are making a cross compiler, cross != null

     

       191
       191
       -
           NIX_GCC_CROSS = if cross == null then "${stdenv.gccCross}" else "";

     

       191
       191
       +
           NIX_CC_CROSS = if cross == null then "${stdenv.ccCross}" else "";

     

       192
       192
        
           configureFlags = "

     

       193
       193
        
             ${if enableMultilib then "" else "--disable-multilib"}

     

       194
       194
        
             ${if enableShared then "" else "--disable-shared"}

+12 -12

pkgs/development/compilers/gcc/4.5/builder.sh

···

       23
       23
        
       

     

       24
       24
        
       if test "$noSysDirs" = "1"; then

     

       25
       25
        
       

     

       26
       26
       -
           if test -e $NIX_GCC/nix-support/orig-libc; then

     

       26
       26
       +
           if test -e $NIX_CC/nix-support/orig-libc; then

     

       27
       27
        
       

     

       28
       28
        
               # Figure out what extra flags to pass to the gcc compilers

     

       29
       29
        
               # being generated to make sure that they use our glibc.

     

       30
       30
       -
               extraFlags="$(cat $NIX_GCC/nix-support/libc-cflags)"

     

       31
       31
       -
               extraLDFlags="$(cat $NIX_GCC/nix-support/libc-ldflags) $(cat $NIX_GCC/nix-support/libc-ldflags-before)"

     

       30
       30
       +
               extraFlags="$(cat $NIX_CC/nix-support/libc-cflags)"

     

       31
       31
       +
               extraLDFlags="$(cat $NIX_CC/nix-support/libc-ldflags) $(cat $NIX_CC/nix-support/libc-ldflags-before)"

     

       32
       32
        
       

     

       33
       33
        
               # Use *real* header files, otherwise a limits.h is generated

     

       34
       34
        
               # that does not include Glibc's limits.h (notably missing

     

       35
       35
        
               # SSIZE_MAX, which breaks the build).

     

       36
       36
       -
               export NIX_FIXINC_DUMMY=$(cat $NIX_GCC/nix-support/orig-libc)/include

     

       36
       36
       +
               export NIX_FIXINC_DUMMY=$(cat $NIX_CC/nix-support/orig-libc)/include

     

       37
       37
        
       

     

       38
       38
        
               # The path to the Glibc binaries such as `crti.o'.

     

       39
       39
       -
               glibc_libdir="$(cat $NIX_GCC/nix-support/orig-libc)/lib"

     

       39
       39
       +
               glibc_libdir="$(cat $NIX_CC/nix-support/orig-libc)/lib"

     

       40
       40
        
               

     

       41
       41
        
           else

     

       42
       42
        
               # Hack: support impure environments.

     
···

       67
       67
        
                   EXTRA_TARGET_LDFLAGS="-Wl,-L${libcCross}/lib"

     

       68
       68
        
               fi

     

       69
       69
        
           else

     

       70
       70
       -
               if test -z "$NIX_GCC_CROSS"; then

     

       70
       70
       +
               if test -z "$NIX_CC_CROSS"; then

     

       71
       71
        
                   EXTRA_TARGET_CFLAGS="$EXTRA_FLAGS"

     

       72
       72
        
                   EXTRA_TARGET_LDFLAGS="$EXTRA_LDFLAGS"

     

       73
       73
        
               else

     

       74
       74
        
                   # This the case of cross-building the gcc.

     

       75
       75
        
                   # We need special flags for the target, different than those of the build

     

       76
       76
        
                   # Assertion:

     

       77
       77
       -
                   test -e $NIX_GCC_CROSS/nix-support/orig-libc

     

       77
       77
       +
                   test -e $NIX_CC_CROSS/nix-support/orig-libc

     

       78
       78
        
       

     

       79
       79
        
                   # Figure out what extra flags to pass to the gcc compilers

     

       80
       80
        
                   # being generated to make sure that they use our glibc.

     

       81
       81
       -
                   extraFlags="$(cat $NIX_GCC_CROSS/nix-support/libc-cflags)"

     

       82
       82
       -
                   extraLDFlags="$(cat $NIX_GCC_CROSS/nix-support/libc-ldflags) $(cat $NIX_GCC_CROSS/nix-support/libc-ldflags-before)"

     

       81
       81
       +
                   extraFlags="$(cat $NIX_CC_CROSS/nix-support/libc-cflags)"

     

       82
       82
       +
                   extraLDFlags="$(cat $NIX_CC_CROSS/nix-support/libc-ldflags) $(cat $NIX_CC_CROSS/nix-support/libc-ldflags-before)"

     

       83
       83
        
       

     

       84
       84
        
                   # Use *real* header files, otherwise a limits.h is generated

     

       85
       85
        
                   # that does not include Glibc's limits.h (notably missing

     

       86
       86
        
                   # SSIZE_MAX, which breaks the build).

     

       87
       87
       -
                   NIX_FIXINC_DUMMY_CROSS=$(cat $NIX_GCC_CROSS/nix-support/orig-libc)/include

     

       87
       87
       +
                   NIX_FIXINC_DUMMY_CROSS=$(cat $NIX_CC_CROSS/nix-support/orig-libc)/include

     

       88
       88
        
       

     

       89
       89
        
                   # The path to the Glibc binaries such as `crti.o'.

     

       90
       90
       -
                   glibc_libdir="$(cat $NIX_GCC_CROSS/nix-support/orig-libc)/lib"

     

       90
       90
       +
                   glibc_libdir="$(cat $NIX_CC_CROSS/nix-support/orig-libc)/lib"

     

       91
       91
        
       

     

       92
       92
        
                   extraFlags="-I$NIX_FIXINC_DUMMY_CROSS $extraFlags"

     

       93
       93
        
                   extraLDFlags="-L$glibc_libdir -rpath $glibc_libdir $extraLDFlags"

     
···

       162
       162
        
           # Patch the configure script so it finds glibc headers

     

       163
       163
        
           # It's important for example in order not to get libssp built, because it's

     

       164
       164
        
           # functionality is in glibc already.

     

       165
       165
       -
           glibc_headers="$(cat $NIX_GCC/nix-support/orig-libc)/include"

     

       165
       165
       +
           glibc_headers="$(cat $NIX_CC/nix-support/orig-libc)/include"

     

       166
       166
        
           sed -i \

     

       167
       167
        
             -e s,glibc_header_dir=/usr/include,glibc_header_dir=$glibc_headers, \

     

       168
       168
        
             gcc/configure

+3 -3

pkgs/development/compilers/gcc/4.5/default.nix

···

       185
       185
        
                  sed -i gcc/config/t-gnu \

     

       186
       186
        
                      -es'|NATIVE_SYSTEM_HEADER_DIR.*$|NATIVE_SYSTEM_HEADER_DIR = ${libc}/include|g'

     

       187
       187
        
               ''

     

       188
       188
       -
           else if cross != null || stdenv.gcc.libc != null then

     

       188
       188
       +
           else if cross != null || stdenv.cc.libc != null then

     

       189
       189
        
             # On NixOS, use the right path to the dynamic linker instead of

     

       190
       190
        
             # `/lib/ld*.so'.

     

       191
       191
        
             let

     

       192
       192
       -
               libc = if libcCross != null then libcCross else stdenv.gcc.libc;

     

       192
       192
       +
               libc = if libcCross != null then libcCross else stdenv.cc.libc;

     

       193
       193
        
             in

     

       194
       194
        
               '' echo "fixing the \`GLIBC_DYNAMIC_LINKER' and \`UCLIBC_DYNAMIC_LINKER' macros..."

     

       195
       195
        
                  for header in "gcc/config/"*-gnu.h "gcc/config/"*"/"*.h

     
···

       272
       272
        
           NM_FOR_TARGET = "${stdenv.cross.config}-nm";

     

       273
       273
        
           CXX_FOR_TARGET = "${stdenv.cross.config}-g++";

     

       274
       274
        
           # If we are making a cross compiler, cross != null

     

       275
       275
       -
           NIX_GCC_CROSS = if cross == null then "${stdenv.gccCross}" else "";

     

       275
       275
       +
           NIX_CC_CROSS = if cross == null then "${stdenv.ccCross}" else "";

     

       276
       276
        
           dontStrip = true;

     

       277
       277
        
           configureFlags = ''

     

       278
       278
        
             ${if enableMultilib then "" else "--disable-multilib"}

+13 -13

pkgs/development/compilers/gcc/4.6/builder.sh

···

       19
       19
        
       

     

       20
       20
        
       if test "$noSysDirs" = "1"; then

     

       21
       21
        
       

     

       22
       22
       -
           if test -e $NIX_GCC/nix-support/orig-libc; then

     

       22
       22
       +
           if test -e $NIX_CC/nix-support/orig-libc; then

     

       23
       23
        
       

     

       24
       24
        
               # Figure out what extra flags to pass to the gcc compilers

     

       25
       25
        
               # being generated to make sure that they use our glibc.

     

       26
       26
       -
               extraFlags="$(cat $NIX_GCC/nix-support/libc-cflags)"

     

       27
       27
       -
               extraLDFlags="$(cat $NIX_GCC/nix-support/libc-ldflags) $(cat $NIX_GCC/nix-support/libc-ldflags-before)"

     

       26
       26
       +
               extraFlags="$(cat $NIX_CC/nix-support/libc-cflags)"

     

       27
       27
       +
               extraLDFlags="$(cat $NIX_CC/nix-support/libc-ldflags) $(cat $NIX_CC/nix-support/libc-ldflags-before)"

     

       28
       28
        
       

     

       29
       29
        
               # Use *real* header files, otherwise a limits.h is generated

     

       30
       30
        
               # that does not include Glibc's limits.h (notably missing

     

       31
       31
        
               # SSIZE_MAX, which breaks the build).

     

       32
       32
       -
               export NIX_FIXINC_DUMMY=$(cat $NIX_GCC/nix-support/orig-libc)/include

     

       32
       32
       +
               export NIX_FIXINC_DUMMY=$(cat $NIX_CC/nix-support/orig-libc)/include

     

       33
       33
        
       

     

       34
       34
        
               # The path to the Glibc binaries such as `crti.o'.

     

       35
       35
       -
               glibc_libdir="$(cat $NIX_GCC/nix-support/orig-libc)/lib"

     

       35
       35
       +
               glibc_libdir="$(cat $NIX_CC/nix-support/orig-libc)/lib"

     

       36
       36
        
       

     

       37
       37
        
           else

     

       38
       38
        
               # Hack: support impure environments.

     
···

       74
       74
        
                   EXTRA_TARGET_LDFLAGS="-Wl,-L${libcCross}/lib"

     

       75
       75
        
               fi

     

       76
       76
        
           else

     

       77
       77
       -
               if test -z "$NIX_GCC_CROSS"; then

     

       77
       77
       +
               if test -z "$NIX_CC_CROSS"; then

     

       78
       78
        
                   EXTRA_TARGET_CFLAGS="$EXTRA_FLAGS"

     

       79
       79
        
                   EXTRA_TARGET_LDFLAGS="$EXTRA_LDFLAGS"

     

       80
       80
        
               else

     

       81
       81
        
                   # This the case of cross-building the gcc.

     

       82
       82
        
                   # We need special flags for the target, different than those of the build

     

       83
       83
        
                   # Assertion:

     

       84
       84
       -
                   test -e $NIX_GCC_CROSS/nix-support/orig-libc

     

       84
       84
       +
                   test -e $NIX_CC_CROSS/nix-support/orig-libc

     

       85
       85
        
       

     

       86
       86
        
                   # Figure out what extra flags to pass to the gcc compilers

     

       87
       87
        
                   # being generated to make sure that they use our glibc.

     

       88
       88
       -
                   extraFlags="$(cat $NIX_GCC_CROSS/nix-support/libc-cflags)"

     

       89
       89
       -
                   extraLDFlags="$(cat $NIX_GCC_CROSS/nix-support/libc-ldflags) $(cat $NIX_GCC_CROSS/nix-support/libc-ldflags-before)"

     

       88
       88
       +
                   extraFlags="$(cat $NIX_CC_CROSS/nix-support/libc-cflags)"

     

       89
       89
       +
                   extraLDFlags="$(cat $NIX_CC_CROSS/nix-support/libc-ldflags) $(cat $NIX_CC_CROSS/nix-support/libc-ldflags-before)"

     

       90
       90
        
       

     

       91
       91
        
                   # Use *real* header files, otherwise a limits.h is generated

     

       92
       92
        
                   # that does not include Glibc's limits.h (notably missing

     

       93
       93
        
                   # SSIZE_MAX, which breaks the build).

     

       94
       94
       -
                   NIX_FIXINC_DUMMY_CROSS=$(cat $NIX_GCC_CROSS/nix-support/orig-libc)/include

     

       94
       94
       +
                   NIX_FIXINC_DUMMY_CROSS=$(cat $NIX_CC_CROSS/nix-support/orig-libc)/include

     

       95
       95
        
       

     

       96
       96
        
                   # The path to the Glibc binaries such as `crti.o'.

     

       97
       97
       -
                   glibc_libdir="$(cat $NIX_GCC_CROSS/nix-support/orig-libc)/lib"

     

       97
       97
       +
                   glibc_libdir="$(cat $NIX_CC_CROSS/nix-support/orig-libc)/lib"

     

       98
       98
        
       

     

       99
       99
        
                   extraFlags="-I$NIX_FIXINC_DUMMY_CROSS $extraFlags"

     

       100
       100
        
                   extraLDFlags="-L$glibc_libdir -rpath $glibc_libdir $extraLDFlags"

     
···

       166
       166
        
               rm -Rf zlib

     

       167
       167
        
           fi

     

       168
       168
        
       

     

       169
       169
       -
           if test -f "$NIX_GCC/nix-support/orig-libc"; then

     

       169
       169
       +
           if test -f "$NIX_CC/nix-support/orig-libc"; then

     

       170
       170
        
               # Patch the configure script so it finds glibc headers.  It's

     

       171
       171
        
               # important for example in order not to get libssp built,

     

       172
       172
        
               # because its functionality is in glibc already.

     

       173
       173
       -
               glibc_headers="$(cat $NIX_GCC/nix-support/orig-libc)/include"

     

       173
       173
       +
               glibc_headers="$(cat $NIX_CC/nix-support/orig-libc)/include"

     

       174
       174
        
               sed -i \

     

       175
       175
        
                   -e "s,glibc_header_dir=/usr/include,glibc_header_dir=$glibc_headers", \

     

       176
       176
        
                   gcc/configure

+3 -3

pkgs/development/compilers/gcc/4.6/default.nix

···

       229
       229
        
                  sed -i gcc/config/t-gnu \

     

       230
       230
        
                      -es'|NATIVE_SYSTEM_HEADER_DIR.*$|NATIVE_SYSTEM_HEADER_DIR = ${libc}/include|g'

     

       231
       231
        
               ''

     

       232
       232
       -
           else if cross != null || stdenv.gcc.libc != null then

     

       232
       232
       +
           else if cross != null || stdenv.cc.libc != null then

     

       233
       233
        
             # On NixOS, use the right path to the dynamic linker instead of

     

       234
       234
        
             # `/lib/ld*.so'.

     

       235
       235
        
             let

     

       236
       236
       -
               libc = if libcCross != null then libcCross else stdenv.gcc.libc;

     

       236
       236
       +
               libc = if libcCross != null then libcCross else stdenv.cc.libc;

     

       237
       237
        
             in

     

       238
       238
        
               '' echo "fixing the \`GLIBC_DYNAMIC_LINKER' and \`UCLIBC_DYNAMIC_LINKER' macros..."

     

       239
       239
        
                  for header in "gcc/config/"*-gnu.h "gcc/config/"*"/"*.h

     
···

       339
       339
        
           NM_FOR_TARGET = "${stdenv.cross.config}-nm";

     

       340
       340
        
           CXX_FOR_TARGET = "${stdenv.cross.config}-g++";

     

       341
       341
        
           # If we are making a cross compiler, cross != null

     

       342
       342
       -
           NIX_GCC_CROSS = if cross == null then "${stdenv.gccCross}" else "";

     

       342
       342
       +
           NIX_CC_CROSS = if cross == null then "${stdenv.ccCross}" else "";

     

       343
       343
        
           dontStrip = true;

     

       344
       344
        
           configureFlags = ''

     

       345
       345
        
             ${if enableMultilib then "" else "--disable-multilib"}

+13 -13

pkgs/development/compilers/gcc/4.8/builder.sh

···

       19
       19
        
       

     

       20
       20
        
       if test "$noSysDirs" = "1"; then

     

       21
       21
        
       

     

       22
       22
       -
           if test -e $NIX_GCC/nix-support/orig-libc; then

     

       22
       22
       +
           if test -e $NIX_CC/nix-support/orig-libc; then

     

       23
       23
        
       

     

       24
       24
        
               # Figure out what extra flags to pass to the gcc compilers

     

       25
       25
        
               # being generated to make sure that they use our glibc.

     

       26
       26
       -
               extraFlags="$(cat $NIX_GCC/nix-support/libc-cflags)"

     

       27
       27
       -
               extraLDFlags="$(cat $NIX_GCC/nix-support/libc-ldflags) $(cat $NIX_GCC/nix-support/libc-ldflags-before)"

     

       26
       26
       +
               extraFlags="$(cat $NIX_CC/nix-support/libc-cflags)"

     

       27
       27
       +
               extraLDFlags="$(cat $NIX_CC/nix-support/libc-ldflags) $(cat $NIX_CC/nix-support/libc-ldflags-before)"

     

       28
       28
        
       

     

       29
       29
        
               # Use *real* header files, otherwise a limits.h is generated

     

       30
       30
        
               # that does not include Glibc's limits.h (notably missing

     

       31
       31
        
               # SSIZE_MAX, which breaks the build).

     

       32
       32
       -
               export NIX_FIXINC_DUMMY=$(cat $NIX_GCC/nix-support/orig-libc)/include

     

       32
       32
       +
               export NIX_FIXINC_DUMMY=$(cat $NIX_CC/nix-support/orig-libc)/include

     

       33
       33
        
       

     

       34
       34
        
               # The path to the Glibc binaries such as `crti.o'.

     

       35
       35
       -
               glibc_libdir="$(cat $NIX_GCC/nix-support/orig-libc)/lib"

     

       35
       35
       +
               glibc_libdir="$(cat $NIX_CC/nix-support/orig-libc)/lib"

     

       36
       36
        
       

     

       37
       37
        
           else

     

       38
       38
        
               # Hack: support impure environments.

     
···

       74
       74
        
                   EXTRA_TARGET_LDFLAGS="-Wl,-L${libcCross}/lib -Wl,-rpath,${libcCross}/lib -Wl,-rpath-link,${libcCross}/lib"

     

       75
       75
        
               fi

     

       76
       76
        
           else

     

       77
       77
       -
               if test -z "$NIX_GCC_CROSS"; then

     

       77
       77
       +
               if test -z "$NIX_CC_CROSS"; then

     

       78
       78
        
                   EXTRA_TARGET_CFLAGS="$EXTRA_FLAGS"

     

       79
       79
        
                   EXTRA_TARGET_CXXFLAGS="$EXTRA_FLAGS"

     

       80
       80
        
                   EXTRA_TARGET_LDFLAGS="$EXTRA_LDFLAGS"

     
···

       82
       82
        
                   # This the case of cross-building the gcc.

     

       83
       83
        
                   # We need special flags for the target, different than those of the build

     

       84
       84
        
                   # Assertion:

     

       85
       85
       -
                   test -e $NIX_GCC_CROSS/nix-support/orig-libc

     

       85
       85
       +
                   test -e $NIX_CC_CROSS/nix-support/orig-libc

     

       86
       86
        
       

     

       87
       87
        
                   # Figure out what extra flags to pass to the gcc compilers

     

       88
       88
        
                   # being generated to make sure that they use our glibc.

     

       89
       89
       -
                   extraFlags="$(cat $NIX_GCC_CROSS/nix-support/libc-cflags)"

     

       90
       90
       -
                   extraLDFlags="$(cat $NIX_GCC_CROSS/nix-support/libc-ldflags) $(cat $NIX_GCC_CROSS/nix-support/libc-ldflags-before)"

     

       89
       89
       +
                   extraFlags="$(cat $NIX_CC_CROSS/nix-support/libc-cflags)"

     

       90
       90
       +
                   extraLDFlags="$(cat $NIX_CC_CROSS/nix-support/libc-ldflags) $(cat $NIX_CC_CROSS/nix-support/libc-ldflags-before)"

     

       91
       91
        
       

     

       92
       92
        
                   # Use *real* header files, otherwise a limits.h is generated

     

       93
       93
        
                   # that does not include Glibc's limits.h (notably missing

     

       94
       94
        
                   # SSIZE_MAX, which breaks the build).

     

       95
       95
       -
                   NIX_FIXINC_DUMMY_CROSS=$(cat $NIX_GCC_CROSS/nix-support/orig-libc)/include

     

       95
       95
       +
                   NIX_FIXINC_DUMMY_CROSS=$(cat $NIX_CC_CROSS/nix-support/orig-libc)/include

     

       96
       96
        
       

     

       97
       97
        
                   # The path to the Glibc binaries such as `crti.o'.

     

       98
       98
       -
                   glibc_dir="$(cat $NIX_GCC_CROSS/nix-support/orig-libc)"

     

       98
       98
       +
                   glibc_dir="$(cat $NIX_CC_CROSS/nix-support/orig-libc)"

     

       99
       99
        
                   glibc_libdir="$glibc_dir/lib"

     

       100
       100
        
                   configureFlags="$configureFlags --with-native-system-header-dir=$glibc_dir/include"

     

       101
       101
        
       

     
···

       167
       167
        
               rm -Rf zlib

     

       168
       168
        
           fi

     

       169
       169
        
       

     

       170
       170
       -
           if test -f "$NIX_GCC/nix-support/orig-libc"; then

     

       170
       170
       +
           if test -f "$NIX_CC/nix-support/orig-libc"; then

     

       171
       171
        
               # Patch the configure script so it finds glibc headers.  It's

     

       172
       172
        
               # important for example in order not to get libssp built,

     

       173
       173
        
               # because its functionality is in glibc already.

     

       174
       174
       -
               glibc_headers="$(cat $NIX_GCC/nix-support/orig-libc)/include"

     

       174
       174
       +
               glibc_headers="$(cat $NIX_CC/nix-support/orig-libc)/include"

     

       175
       175
        
               sed -i \

     

       176
       176
        
                   -e "s,glibc_header_dir=/usr/include,glibc_header_dir=$glibc_headers", \

     

       177
       177
        
                   gcc/configure

+3 -3

pkgs/development/compilers/gcc/4.8/default.nix

···

       251
       251
        
                  sed -i "${gnu_h}" \

     

       252
       252
        
                      -es'|#define STANDARD_INCLUDE_DIR.*$|#define STANDARD_INCLUDE_DIR "${libc}/include"|g'

     

       253
       253
        
               ''

     

       254
       254
       -
           else if cross != null || stdenv.gcc.libc != null then

     

       254
       254
       +
           else if cross != null || stdenv.cc.libc != null then

     

       255
       255
        
             # On NixOS, use the right path to the dynamic linker instead of

     

       256
       256
        
             # `/lib/ld*.so'.

     

       257
       257
        
             let

     

       258
       258
       -
               libc = if libcCross != null then libcCross else stdenv.gcc.libc;

     

       258
       258
       +
               libc = if libcCross != null then libcCross else stdenv.cc.libc;

     

       259
       259
        
             in

     

       260
       260
        
               '' echo "fixing the \`GLIBC_DYNAMIC_LINKER' and \`UCLIBC_DYNAMIC_LINKER' macros..."

     

       261
       261
        
                  for header in "gcc/config/"*-gnu.h "gcc/config/"*"/"*.h

     
···

       397
       397
        
           NM_FOR_TARGET = "${stdenv.cross.config}-nm";

     

       398
       398
        
           CXX_FOR_TARGET = "${stdenv.cross.config}-g++";

     

       399
       399
        
           # If we are making a cross compiler, cross != null

     

       400
       400
       -
           NIX_GCC_CROSS = if cross == null then "${stdenv.gccCross}" else "";

     

       400
       400
       +
           NIX_CC_CROSS = if cross == null then "${stdenv.ccCross}" else "";

     

       401
       401
        
           dontStrip = true;

     

       402
       402
        
           configureFlags = ''

     

       403
       403
        
             ${if enableMultilib then "" else "--disable-multilib"}

+13 -13

pkgs/development/compilers/gcc/4.9/builder.sh

···

       19
       19
        
       

     

       20
       20
        
       if test "$noSysDirs" = "1"; then

     

       21
       21
        
       

     

       22
       22
       -
           if test -e $NIX_GCC/nix-support/orig-libc; then

     

       22
       22
       +
           if test -e $NIX_CC/nix-support/orig-libc; then

     

       23
       23
        
       

     

       24
       24
        
               # Figure out what extra flags to pass to the gcc compilers

     

       25
       25
        
               # being generated to make sure that they use our glibc.

     

       26
       26
       -
               extraFlags="$(cat $NIX_GCC/nix-support/libc-cflags)"

     

       27
       27
       -
               extraLDFlags="$(cat $NIX_GCC/nix-support/libc-ldflags) $(cat $NIX_GCC/nix-support/libc-ldflags-before)"

     

       26
       26
       +
               extraFlags="$(cat $NIX_CC/nix-support/libc-cflags)"

     

       27
       27
       +
               extraLDFlags="$(cat $NIX_CC/nix-support/libc-ldflags) $(cat $NIX_CC/nix-support/libc-ldflags-before)"

     

       28
       28
        
       

     

       29
       29
        
               # Use *real* header files, otherwise a limits.h is generated

     

       30
       30
        
               # that does not include Glibc's limits.h (notably missing

     

       31
       31
        
               # SSIZE_MAX, which breaks the build).

     

       32
       32
       -
               export NIX_FIXINC_DUMMY=$(cat $NIX_GCC/nix-support/orig-libc)/include

     

       32
       32
       +
               export NIX_FIXINC_DUMMY=$(cat $NIX_CC/nix-support/orig-libc)/include

     

       33
       33
        
       

     

       34
       34
        
               # The path to the Glibc binaries such as `crti.o'.

     

       35
       35
       -
               glibc_libdir="$(cat $NIX_GCC/nix-support/orig-libc)/lib"

     

       35
       35
       +
               glibc_libdir="$(cat $NIX_CC/nix-support/orig-libc)/lib"

     

       36
       36
        
       

     

       37
       37
        
           else

     

       38
       38
        
               # Hack: support impure environments.

     
···

       74
       74
        
                   EXTRA_TARGET_LDFLAGS="-Wl,-L${libcCross}/lib -Wl,-rpath,${libcCross}/lib -Wl,-rpath-link,${libcCross}/lib"

     

       75
       75
        
               fi

     

       76
       76
        
           else

     

       77
       77
       -
               if test -z "$NIX_GCC_CROSS"; then

     

       77
       77
       +
               if test -z "$NIX_CC_CROSS"; then

     

       78
       78
        
                   EXTRA_TARGET_CFLAGS="$EXTRA_FLAGS"

     

       79
       79
        
                   EXTRA_TARGET_CXXFLAGS="$EXTRA_FLAGS"

     

       80
       80
        
                   EXTRA_TARGET_LDFLAGS="$EXTRA_LDFLAGS"

     
···

       82
       82
        
                   # This the case of cross-building the gcc.

     

       83
       83
        
                   # We need special flags for the target, different than those of the build

     

       84
       84
        
                   # Assertion:

     

       85
       85
       -
                   test -e $NIX_GCC_CROSS/nix-support/orig-libc

     

       85
       85
       +
                   test -e $NIX_CC_CROSS/nix-support/orig-libc

     

       86
       86
        
       

     

       87
       87
        
                   # Figure out what extra flags to pass to the gcc compilers

     

       88
       88
        
                   # being generated to make sure that they use our glibc.

     

       89
       89
       -
                   extraFlags="$(cat $NIX_GCC_CROSS/nix-support/libc-cflags)"

     

       90
       90
       -
                   extraLDFlags="$(cat $NIX_GCC_CROSS/nix-support/libc-ldflags) $(cat $NIX_GCC_CROSS/nix-support/libc-ldflags-before)"

     

       89
       89
       +
                   extraFlags="$(cat $NIX_CC_CROSS/nix-support/libc-cflags)"

     

       90
       90
       +
                   extraLDFlags="$(cat $NIX_CC_CROSS/nix-support/libc-ldflags) $(cat $NIX_CC_CROSS/nix-support/libc-ldflags-before)"

     

       91
       91
        
       

     

       92
       92
        
                   # Use *real* header files, otherwise a limits.h is generated

     

       93
       93
        
                   # that does not include Glibc's limits.h (notably missing

     

       94
       94
        
                   # SSIZE_MAX, which breaks the build).

     

       95
       95
       -
                   NIX_FIXINC_DUMMY_CROSS=$(cat $NIX_GCC_CROSS/nix-support/orig-libc)/include

     

       95
       95
       +
                   NIX_FIXINC_DUMMY_CROSS=$(cat $NIX_CC_CROSS/nix-support/orig-libc)/include

     

       96
       96
        
       

     

       97
       97
        
                   # The path to the Glibc binaries such as `crti.o'.

     

       98
       98
       -
                   glibc_dir="$(cat $NIX_GCC_CROSS/nix-support/orig-libc)"

     

       98
       98
       +
                   glibc_dir="$(cat $NIX_CC_CROSS/nix-support/orig-libc)"

     

       99
       99
        
                   glibc_libdir="$glibc_dir/lib"

     

       100
       100
        
                   configureFlags="$configureFlags --with-native-system-header-dir=$glibc_dir/include"

     

       101
       101
        
       

     
···

       171
       171
        
               rm -Rf zlib

     

       172
       172
        
           fi

     

       173
       173
        
       

     

       174
       174
       -
           if test -f "$NIX_GCC/nix-support/orig-libc"; then

     

       174
       174
       +
           if test -f "$NIX_CC/nix-support/orig-libc"; then

     

       175
       175
        
               # Patch the configure script so it finds glibc headers.  It's

     

       176
       176
        
               # important for example in order not to get libssp built,

     

       177
       177
        
               # because its functionality is in glibc already.

     

       178
       178
       -
               glibc_headers="$(cat $NIX_GCC/nix-support/orig-libc)/include"

     

       178
       178
       +
               glibc_headers="$(cat $NIX_CC/nix-support/orig-libc)/include"

     

       179
       179
        
               sed -i \

     

       180
       180
        
                   -e "s,glibc_header_dir=/usr/include,glibc_header_dir=$glibc_headers", \

     

       181
       181
        
                   gcc/configure

+3 -3

pkgs/development/compilers/gcc/4.9/default.nix

···

       247
       247
        
                  sed -i "${gnu_h}" \

     

       248
       248
        
                      -es'|#define STANDARD_INCLUDE_DIR.*$|#define STANDARD_INCLUDE_DIR "${libc}/include"|g'

     

       249
       249
        
               ''

     

       250
       250
       -
           else if cross != null || stdenv.gcc.libc != null then

     

       250
       250
       +
           else if cross != null || stdenv.cc.libc != null then

     

       251
       251
        
             # On NixOS, use the right path to the dynamic linker instead of

     

       252
       252
        
             # `/lib/ld*.so'.

     

       253
       253
        
             let

     

       254
       254
       -
               libc = if libcCross != null then libcCross else stdenv.gcc.libc;

     

       254
       254
       +
               libc = if libcCross != null then libcCross else stdenv.cc.libc;

     

       255
       255
        
             in

     

       256
       256
        
               '' echo "fixing the \`GLIBC_DYNAMIC_LINKER' and \`UCLIBC_DYNAMIC_LINKER' macros..."

     

       257
       257
        
                  for header in "gcc/config/"*-gnu.h "gcc/config/"*"/"*.h

     
···

       385
       385
        
           NM_FOR_TARGET = "${stdenv.cross.config}-nm";

     

       386
       386
        
           CXX_FOR_TARGET = "${stdenv.cross.config}-g++";

     

       387
       387
        
           # If we are making a cross compiler, cross != null

     

       388
       388
       -
           NIX_GCC_CROSS = if cross == null then "${stdenv.gccCross}" else "";

     

       388
       388
       +
           NIX_CC_CROSS = if cross == null then "${stdenv.ccCross}" else "";

     

       389
       389
        
           dontStrip = true;

     

       390
       390
        
           configureFlags = ''

     

       391
       391
        
             ${if enableMultilib then "" else "--disable-multilib"}

+6 -6

pkgs/development/compilers/gcl/default.nix

···

       9
       9
        
       in

     

       10
       10
        
       

     

       11
       11
        
       (

     

       12
       12
       -
       assert a.stdenv ? gcc ;

     

       13
       13
       -
       assert a.stdenv.gcc ? gcc ;

     

       14
       14
       -
       assert a.stdenv.gcc ? libc ;

     

       15
       15
       -
       assert a.stdenv.gcc.gcc != null ;

     

       16
       16
       -
       assert a.stdenv.gcc.libc != null ;

     

       12
       12
       +
       assert a.stdenv ? cc ;

     

       13
       13
       +
       assert a.stdenv.cc ? gcc ;

     

       14
       14
       +
       assert a.stdenv.cc ? libc ;

     

       15
       15
       +
       assert a.stdenv.cc.gcc != null ;

     

       16
       16
       +
       assert a.stdenv.cc.libc != null ;

     

       17
       17
        
       

     

       18
       18
        
       rec {

     

       19
       19
        
         src = a.fetchurl {

     
···

       37
       37
        
         preBuild = a.fullDepEntry (''

     

       38
       38
        
           sed -re "s@/bin/cat@$(which cat)@g" -i configure */configure

     

       39
       39
        
           sed -re "s@if test -d /proc/self @if false @" -i configure

     

       40
       40
       -
           sed -re 's^([ \t])cpp ^\1cpp -I${a.stdenv.gcc.gcc}/include -I${a.stdenv.gcc.libc}/include ^g' -i makefile

     

       40
       40
       +
           sed -re 's^([ \t])cpp ^\1cpp -I${a.stdenv.cc.gcc}/include -I${a.stdenv.cc.libc}/include ^g' -i makefile

     

       41
       41
        
         '') ["minInit" "doUnpack" "addInputs"];

     

       42
       42
        
       

     

       43
       43
        
         /* doConfigure should be removed if not needed */

+1 -1

pkgs/development/compilers/ghc/6.10.1-binary.nix

···

       45
       45
        
           # find editline/gmp.

     

       46
       46
        
           (if stdenv.isLinux then ''

     

       47
       47
        
             find . -type f -perm +100 \

     

       48
       48
       -
                 -exec patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \

     

       48
       48
       +
                 -exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \

     

       49
       49
        
                 --set-rpath "${libedit}/lib:${ncurses}/lib:${gmp}/lib" {} \;

     

       50
       50
        
             for prog in ld ar gcc strip ranlib; do

     

       51
       51
        
               find . -name "setup-config" -exec sed -i "s@/usr/bin/$prog@$(type -p $prog)@g" {} \;

+1 -1

pkgs/development/compilers/ghc/6.10.1.nix

···

       17
       17
        
         configureFlags=[

     

       18
       18
        
           "--with-gmp-libraries=${gmp}/lib"

     

       19
       19
        
           "--with-gmp-includes=${gmp}/include"

     

       20
       20
       -
           "--with-gcc=${stdenv.gcc}/bin/gcc"

     

       20
       20
       +
           "--with-gcc=${stdenv.cc}/bin/gcc"

     

       21
       21
        
         ];

     

       22
       22
        
       

     

       23
       23
        
         meta = {

+1 -1

pkgs/development/compilers/ghc/6.10.2-binary.nix

···

       39
       39
        
           # find editline/gmp.

     

       40
       40
        
           (if stdenv.isLinux then ''

     

       41
       41
        
             find . -type f -perm +100 \

     

       42
       42
       -
                 -exec patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \

     

       42
       42
       +
                 -exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \

     

       43
       43
        
                 --set-rpath "${libedit}/lib:${ncurses}/lib:${gmp}/lib" {} \;

     

       44
       44
        
             for prog in ld ar gcc strip ranlib; do

     

       45
       45
        
               find . -name "setup-config" -exec sed -i "s@/usr/bin/$prog@$(type -p $prog)@g" {} \;

+1 -1

pkgs/development/compilers/ghc/6.10.2.nix

···

       17
       17
        
         configureFlags=[

     

       18
       18
        
           "--with-gmp-libraries=${gmp}/lib"

     

       19
       19
        
           "--with-gmp-includes=${gmp}/include"

     

       20
       20
       -
           "--with-gcc=${stdenv.gcc}/bin/gcc"

     

       20
       20
       +
           "--with-gcc=${stdenv.cc}/bin/gcc"

     

       21
       21
        
         ];

     

       22
       22
        
       

     

       23
       23
        
         meta = {

+1 -1

pkgs/development/compilers/ghc/6.10.3.nix

···

       17
       17
        
         configureFlags=[

     

       18
       18
        
           "--with-gmp-libraries=${gmp}/lib"

     

       19
       19
        
           "--with-gmp-includes=${gmp}/include"

     

       20
       20
       -
           "--with-gcc=${stdenv.gcc}/bin/gcc"

     

       20
       20
       +
           "--with-gcc=${stdenv.cc}/bin/gcc"

     

       21
       21
        
         ];

     

       22
       22
        
       

     

       23
       23
        
         meta = {

+1 -1

pkgs/development/compilers/ghc/6.10.4.nix

···

       17
       17
        
         configureFlags=[

     

       18
       18
        
           "--with-gmp-libraries=${gmp}/lib"

     

       19
       19
        
           "--with-gmp-includes=${gmp}/include"

     

       20
       20
       -
           "--with-gcc=${stdenv.gcc}/bin/gcc"

     

       20
       20
       +
           "--with-gcc=${stdenv.cc}/bin/gcc"

     

       21
       21
        
         ];

     

       22
       22
        
       

     

       23
       23
        
         NIX_CFLAGS_COMPILE = "-fomit-frame-pointer";

+1 -1

pkgs/development/compilers/ghc/6.11.nix

···

       17
       17
        
         configureFlags=[

     

       18
       18
        
           "--with-gmp-libraries=${gmp}/lib"

     

       19
       19
        
           "--with-gmp-includes=${gmp}/include"

     

       20
       20
       -
           "--with-gcc=${stdenv.gcc}/bin/gcc"

     

       20
       20
       +
           "--with-gcc=${stdenv.cc}/bin/gcc"

     

       21
       21
        
         ];

     

       22
       22
        
       

     

       23
       23
        
         preConfigure=[

+1 -1

pkgs/development/compilers/ghc/6.12.1-binary.nix

···

       42
       42
        
           # find editline/gmp.

     

       43
       43
        
           (if stdenv.isLinux then ''

     

       44
       44
        
             find . -type f -perm +100 \

     

       45
       45
       -
                 -exec patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \

     

       45
       45
       +
                 -exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \

     

       46
       46
        
                 --set-rpath "${ncurses}/lib:${gmp}/lib" {} \;

     

       47
       47
        
             sed -i "s|/usr/bin/perl|perl\x00        |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2

     

       48
       48
        
             sed -i "s|/usr/bin/gcc|gcc\x00        |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2

+1 -1

pkgs/development/compilers/ghc/6.12.1.nix

···

       22
       22
        
         '';

     

       23
       23
        
       

     

       24
       24
        
         configureFlags=[

     

       25
       25
       -
           "--with-gcc=${stdenv.gcc}/bin/gcc"

     

       25
       25
       +
           "--with-gcc=${stdenv.cc}/bin/gcc"

     

       26
       26
        
         ];

     

       27
       27
        
       

     

       28
       28
        
         # required, because otherwise all symbols from HSffi.o are stripped, and

+1 -1

pkgs/development/compilers/ghc/6.12.2.nix

···

       22
       22
        
         '';

     

       23
       23
        
       

     

       24
       24
        
         configureFlags=[

     

       25
       25
       -
           "--with-gcc=${stdenv.gcc}/bin/gcc"

     

       25
       25
       +
           "--with-gcc=${stdenv.cc}/bin/gcc"

     

       26
       26
        
         ];

     

       27
       27
        
       

     

       28
       28
        
         # required, because otherwise all symbols from HSffi.o are stripped, and

+1 -1

pkgs/development/compilers/ghc/6.12.3.nix

···

       22
       22
        
         '';

     

       23
       23
        
       

     

       24
       24
        
         configureFlags=[

     

       25
       25
       -
           "--with-gcc=${stdenv.gcc}/bin/gcc"

     

       25
       25
       +
           "--with-gcc=${stdenv.cc}/bin/gcc"

     

       26
       26
        
         ];

     

       27
       27
        
       

     

       28
       28
        
         NIX_CFLAGS_COMPILE = "-fomit-frame-pointer";

+1 -1

pkgs/development/compilers/ghc/6.4.2-binary.nix

···

       30
       30
        
         # find readline/gmp.

     

       31
       31
        
         postBuild = if stdenv.isLinux then "

     

       32
       32
        
           find . -type f -perm +100 \\

     

       33
       33
       -
               -exec patchelf --interpreter \"$(cat $NIX_GCC/nix-support/dynamic-linker)\" \\

     

       33
       33
       +
               -exec patchelf --interpreter \"$(cat $NIX_CC/nix-support/dynamic-linker)\" \\

     

       34
       34
        
               --set-rpath \"${readline}/lib:${ncurses}/lib:${gmp}/lib\" {} \\;

     

       35
       35
        
         " else "";

     

       36
       36

+1 -1

pkgs/development/compilers/ghc/6.4.2.nix

···

       12
       12
        
       

     

       13
       13
        
         propagatedBuildInputs = [readline ncurses gmp];

     

       14
       14
        
       

     

       15
       15
       -
         configureFlags = "--with-gcc=${stdenv.gcc}/bin/gcc";

     

       15
       15
       +
         configureFlags = "--with-gcc=${stdenv.cc}/bin/gcc";

     

       16
       16
        
       

     

       17
       17
        
         preConfigure =

     

       18
       18
        
           ''

+1 -1

pkgs/development/compilers/ghc/6.8.2.nix

···

       25
       25
        
           "--with-gmp-libraries=${gmp}/lib"

     

       26
       26
        
           "--with-gmp-includes=${gmp}/include"

     

       27
       27
        
           "--with-readline-libraries=${readline}/lib"

     

       28
       28
       -
           "--with-gcc=${stdenv.gcc}/bin/gcc"

     

       28
       28
       +
           "--with-gcc=${stdenv.cc}/bin/gcc"

     

       29
       29
        
         ];

     

       30
       30
        
       

     

       31
       31
        
         preConfigure = "

+1 -1

pkgs/development/compilers/ghc/6.8.3.nix

···

       25
       25
        
           "--with-gmp-libraries=${gmp}/lib"

     

       26
       26
        
           "--with-gmp-includes=${gmp}/include"

     

       27
       27
        
           "--with-readline-libraries=${readline}/lib"

     

       28
       28
       -
           "--with-gcc=${stdenv.gcc}/bin/gcc"

     

       28
       28
       +
           "--with-gcc=${stdenv.cc}/bin/gcc"

     

       29
       29
        
         ];

     

       30
       30
        
       

     

       31
       31
        
         preConfigure = ''

+1 -1

pkgs/development/compilers/ghc/7.0.1.nix

···

       22
       22
        
         '';

     

       23
       23
        
       

     

       24
       24
        
         configureFlags=[

     

       25
       25
       -
           "--with-gcc=${stdenv.gcc}/bin/gcc"

     

       25
       25
       +
           "--with-gcc=${stdenv.cc}/bin/gcc"

     

       26
       26
        
         ];

     

       27
       27
        
       

     

       28
       28
        
         # required, because otherwise all symbols from HSffi.o are stripped, and

+1 -1

pkgs/development/compilers/ghc/7.0.2.nix

···

       22
       22
        
         '';

     

       23
       23
        
       

     

       24
       24
        
         configureFlags=[

     

       25
       25
       -
           "--with-gcc=${stdenv.gcc}/bin/gcc"

     

       25
       25
       +
           "--with-gcc=${stdenv.cc}/bin/gcc"

     

       26
       26
        
         ];

     

       27
       27
        
       

     

       28
       28
        
         # required, because otherwise all symbols from HSffi.o are stripped, and

+1 -1

pkgs/development/compilers/ghc/7.0.3.nix

···

       22
       22
        
         '';

     

       23
       23
        
       

     

       24
       24
        
         configureFlags=[

     

       25
       25
       -
           "--with-gcc=${stdenv.gcc}/bin/gcc"

     

       25
       25
       +
           "--with-gcc=${stdenv.cc}/bin/gcc"

     

       26
       26
        
         ];

     

       27
       27
        
       

     

       28
       28
        
         # required, because otherwise all symbols from HSffi.o are stripped, and

+1 -1

pkgs/development/compilers/ghc/7.0.4-binary.nix

···

       52
       52
        
           # find editline/gmp.

     

       53
       53
        
           (if stdenv.isLinux then ''

     

       54
       54
        
             find . -type f -perm +100 \

     

       55
       55
       -
                 -exec patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \

     

       55
       55
       +
                 -exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \

     

       56
       56
        
                 --set-rpath "${ncurses}/lib:${gmp}/lib" {} \;

     

       57
       57
        
             sed -i "s|/usr/bin/perl|perl\x00        |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2

     

       58
       58
        
             sed -i "s|/usr/bin/gcc|gcc\x00        |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2

+1 -1

pkgs/development/compilers/ghc/7.0.4.nix

···

       22
       22
        
         '';

     

       23
       23
        
       

     

       24
       24
        
         configureFlags=[

     

       25
       25
       -
           "--with-gcc=${stdenv.gcc}/bin/gcc"

     

       25
       25
       +
           "--with-gcc=${stdenv.cc}/bin/gcc"

     

       26
       26
        
         ];

     

       27
       27
        
       

     

       28
       28
        
         NIX_CFLAGS_COMPILE = "-fomit-frame-pointer";

+1 -1

pkgs/development/compilers/ghc/7.2.1.nix

···

       22
       22
        
         '';

     

       23
       23
        
       

     

       24
       24
        
         configureFlags=[

     

       25
       25
       -
           "--with-gcc=${stdenv.gcc}/bin/gcc"

     

       25
       25
       +
           "--with-gcc=${stdenv.cc}/bin/gcc"

     

       26
       26
        
         ];

     

       27
       27
        
       

     

       28
       28
        
         # required, because otherwise all symbols from HSffi.o are stripped, and

+1 -1

pkgs/development/compilers/ghc/7.2.2.nix

···

       22
       22
        
         '';

     

       23
       23
        
       

     

       24
       24
        
         configureFlags=[

     

       25
       25
       -
           "--with-gcc=${stdenv.gcc}/bin/gcc"

     

       25
       25
       +
           "--with-gcc=${stdenv.cc}/bin/gcc"

     

       26
       26
        
         ];

     

       27
       27
        
       

     

       28
       28
        
         NIX_CFLAGS_COMPILE = "-fomit-frame-pointer";

+1 -1

pkgs/development/compilers/ghc/7.4.1.nix

···

       22
       22
        
         '';

     

       23
       23
        
       

     

       24
       24
        
         configureFlags=[

     

       25
       25
       -
           "--with-gcc=${stdenv.gcc}/bin/gcc"

     

       25
       25
       +
           "--with-gcc=${stdenv.cc}/bin/gcc"

     

       26
       26
        
         ];

     

       27
       27
        
       

     

       28
       28
        
         # required, because otherwise all symbols from HSffi.o are stripped, and

+1 -1

pkgs/development/compilers/ghc/7.4.2-binary.nix

···

       52
       52
        
           # find editline/gmp.

     

       53
       53
        
           (if stdenv.isLinux then ''

     

       54
       54
        
             find . -type f -perm +100 \

     

       55
       55
       -
                 -exec patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \

     

       55
       55
       +
                 -exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \

     

       56
       56
        
                 --set-rpath "${ncurses}/lib:${gmp}/lib" {} \;

     

       57
       57
        
             sed -i "s|/usr/bin/perl|perl\x00        |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2

     

       58
       58
        
             sed -i "s|/usr/bin/gcc|gcc\x00        |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2

+1 -1

pkgs/development/compilers/ghc/7.4.2.nix

···

       26
       26
        
         '';

     

       27
       27
        
       

     

       28
       28
        
         configureFlags=[

     

       29
       29
       -
           "--with-gcc=${stdenv.gcc}/bin/gcc"

     

       29
       29
       +
           "--with-gcc=${stdenv.cc}/bin/gcc"

     

       30
       30
        
         ];

     

       31
       31
        
       

     

       32
       32
        
         # required, because otherwise all symbols from HSffi.o are stripped, and

+1 -1

pkgs/development/compilers/ghc/7.6.1.nix

···

       23
       23
        
         '';

     

       24
       24
        
       

     

       25
       25
        
         configureFlags=[

     

       26
       26
       -
           "--with-gcc=${stdenv.gcc}/bin/gcc"

     

       26
       26
       +
           "--with-gcc=${stdenv.cc}/bin/gcc"

     

       27
       27
        
         ];

     

       28
       28
        
       

     

       29
       29
        
         # required, because otherwise all symbols from HSffi.o are stripped, and

+1 -1

pkgs/development/compilers/ghc/7.6.2.nix

···

       24
       24
        
         '';

     

       25
       25
        
       

     

       26
       26
        
         configureFlags = [

     

       27
       27
       -
           "--with-gcc=${stdenv.gcc}/bin/gcc"

     

       27
       27
       +
           "--with-gcc=${stdenv.cc}/bin/gcc"

     

       28
       28
        
         ];

     

       29
       29
        
       

     

       30
       30
        
         # required, because otherwise all symbols from HSffi.o are stripped, and

+1 -1

pkgs/development/compilers/ghc/7.6.3.nix

···

       41
       41
        
           export NIX_LDFLAGS="$NIX_LDFLAGS -rpath $out/lib/ghc-${version}"

     

       42
       42
        
         '';

     

       43
       43
        
       

     

       44
       44
       -
         configureFlags = "--with-gcc=${stdenv.gcc}/bin/gcc";

     

       44
       44
       +
         configureFlags = "--with-gcc=${stdenv.cc}/bin/gcc";

     

       45
       45
        
       

     

       46
       46
        
         postInstall = ''

     

       47
       47
        
           # ghci uses mmap with rwx protection at it implements dynamic

+1 -1

pkgs/development/compilers/ghc/7.8.3-binary.nix

···

       52
       52
        
           # find editline/gmp.

     

       53
       53
        
           (if stdenv.isLinux then ''

     

       54
       54
        
             find . -type f -perm +100 \

     

       55
       55
       -
                 -exec patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \

     

       55
       55
       +
                 -exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \

     

       56
       56
        
                 --set-rpath "${ncurses}/lib:${gmp}/lib" {} \;

     

       57
       57
        
             sed -i "s|/usr/bin/perl|perl\x00        |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2

     

       58
       58
        
             sed -i "s|/usr/bin/gcc|gcc\x00        |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2

+1 -1

pkgs/development/compilers/ghc/head.nix

···

       19
       19
        
         '';

     

       20
       20
        
       

     

       21
       21
        
         configureFlags = [

     

       22
       22
       -
           "--with-gcc=${stdenv.gcc}/bin/gcc"

     

       22
       22
       +
           "--with-gcc=${stdenv.cc}/bin/cc"

     

       23
       23
        
           "--with-gmp-includes=${gmp}/include" "--with-gmp-libraries=${gmp}/lib"

     

       24
       24
        
         ];

     

       25
       25

+2 -2

pkgs/development/compilers/gnatboot/default.nix

···

       21
       21
        
           cp -R * $out

     

       22
       22
        
           set +e

     

       23
       23
        
           for a in $out/bin/* ; do

     

       24
       24
       -
             patchelf --interpreter $(cat $NIX_GCC/nix-support/dynamic-linker) \

     

       25
       25
       -
               --set-rpath $(cat $NIX_GCC/nix-support/orig-libc)/lib:$(cat $NIX_GCC/nix-support/orig-gcc)/lib64:$(cat $NIX_GCC/nix-support/orig-gcc)/lib $a

     

       24
       24
       +
             patchelf --interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \

     

       25
       25
       +
               --set-rpath $(cat $NIX_CC/nix-support/orig-libc)/lib:$(cat $NIX_CC/nix-support/orig-gcc)/lib64:$(cat $NIX_CC/nix-support/orig-gcc)/lib $a

     

       26
       26
        
           done

     

       27
       27
        
           set -e

     

       28
       28
        
           mv $out/bin/gnatgcc_2wrap $out/bin/gnatgcc

+4 -6

pkgs/development/compilers/go/1.3.nix

···

       1
       1
        
       { stdenv, lib, fetchurl, fetchhg, bison, glibc, bash, coreutils, makeWrapper, tzdata, iana_etc, perl }:

     

       2
       2
        
       

     

       3
       3
       -
       assert stdenv.gcc.gcc != null;

     

       4
       4
       -
       

     

       5
       3
        
       let

     

       6
       4
        
         loader386 = "${glibc}/lib/ld-linux.so.2";

     

       7
       5
        
         loaderAmd64 = "${glibc}/lib/ld-linux-x86-64.so.2";

     
···

       78
       76
        
                  else throw "Unsupported system";

     

       79
       77
        
         GOARM = stdenv.lib.optionalString (stdenv.system == "armv5tel-linux") "5";

     

       80
       78
        
         GO386 = 387; # from Arch: don't assume sse2 on i686

     

       81
       81
       -
         CGO_ENABLED = 1;

     

       79
       79
       +
         CGO_ENABLED = if stdenv.isDarwin then 0 else 1;

     

       82
       80
        
       

     

       83
       81
        
         installPhase = ''

     

       84
       82
        
           export CC=cc

     

       85
       85
       -
       

     

       83
       83
       +
         '' + stdenv.lib.optionalString (stdenv ? gcc) ''

     

       86
       84
        
           # http://lists.science.uu.nl/pipermail/nix-dev/2013-October/011891.html

     

       87
       85
        
           # Fix for "libgcc_s.so.1 must be installed for pthread_cancel to work"

     

       88
       86
        
           # during tests:

     

       89
       89
       -
           export LD_LIBRARY_PATH="$(dirname $(echo ${stdenv.gcc.gcc}/lib/libgcc_s.so))"

     

       90
       90
       -
       

     

       87
       87
       +
           export LD_LIBRARY_PATH="$(dirname $(echo ${stdenv.cc.gcc}/lib/libgcc_s.so))"

     

       88
       88
       +
         '' + ''

     

       91
       89
        
           mkdir -p "$out/bin"

     

       92
       90
        
           export GOROOT="$(pwd)/"

     

       93
       91
        
           export GOBIN="$out/bin"

+2 -2

pkgs/development/compilers/idris/wrapper.nix

···

       1
       1
       -
       { gmp, makeWrapper, gcc, runCommand, idris_plain, boehmgc}:

     

       1
       1
       +
       { stdenv, gmp, makeWrapper, runCommand, idris_plain, boehmgc}:

     

       2
       2
        
       

     

       3
       3
        
       runCommand "idris-wrapper" {} ''

     

       4
       4
        
         source ${makeWrapper}/nix-support/setup-hook

     
···

       6
       6
        
         ln -s ${idris_plain}/bin/idris $out/bin

     

       7
       7
        
             wrapProgram $out/bin/idris \

     

       8
       8
        
               --suffix NIX_CFLAGS_COMPILE : '"-I${gmp}/include -L${gmp}/lib -L${boehmgc}/lib"' \

     

       9
       9
       -
               --suffix PATH : ${gcc}/bin \

     

       9
       9
       +
               --suffix PATH : ${stdenv.cc}/bin \

     

       10
       10
        
               --suffix PATH : ${idris_plain}/bin

     

       11
       11
        
       ''

+1 -1

pkgs/development/compilers/julia/0.2.1.nix

···

       4
       4
        
        , tcl, tk, xproto, libX11, git, mpfr

     

       5
       5
        
        } :

     

       6
       6
        
       let

     

       7
       7
       -
         realGcc = stdenv.gcc.gcc;

     

       7
       7
       +
         realGcc = stdenv.cc.gcc;

     

       8
       8
        
       in

     

       9
       9
        
       stdenv.mkDerivation rec {

     

       10
       10
        
         pname = "julia";

+5 -5

pkgs/development/compilers/llvm/3.3/clang.nix

···

       2
       2
        
       

     

       3
       3
        
       let

     

       4
       4
        
         version = "3.3";

     

       5
       5
       -
         gccReal = if (stdenv.gcc.gcc or null) == null then stdenv.gcc else stdenv.gcc.gcc;

     

       5
       5
       +
         gccReal = if (stdenv.cc.gcc or null) == null then stdenv.cc else stdenv.cc.gcc;

     

       6
       6
        
       in

     

       7
       7
        
       

     

       8
       8
        
       stdenv.mkDerivation {

     
···

       11
       11
        
         buildInputs = [ perl llvm groff cmake libxml2 python ];

     

       12
       12
        
       

     

       13
       13
        
         patches = [ ./clang-tablegen-dir.patch ] ++

     

       14
       14
       -
                   stdenv.lib.optional (stdenv.gcc.libc != null) ./clang-purity.patch;

     

       14
       14
       +
                   stdenv.lib.optional (stdenv.cc.libc != null) ./clang-purity.patch;

     

       15
       15
        
       

     

       16
       16
        
         cmakeFlags = [

     

       17
       17
        
           "-DCLANG_PATH_TO_LLVM_BUILD=${llvm}"

     

       18
       18
        
           "-DCMAKE_BUILD_TYPE=Release"

     

       19
       19
        
           "-DLLVM_TARGETS_TO_BUILD=all"

     

       20
       20
        
           "-DGCC_INSTALL_PREFIX=${gccReal}"

     

       21
       21
       -
         ] ++ stdenv.lib.optionals (stdenv.gcc.libc != null) [

     

       22
       22
       -
           "-DC_INCLUDE_DIRS=${stdenv.gcc.libc}/include/"

     

       21
       21
       +
         ] ++ stdenv.lib.optionals (stdenv.cc.libc != null) [

     

       22
       22
       +
           "-DC_INCLUDE_DIRS=${stdenv.cc.libc}/include/"

     

       23
       23
        
         ];

     

       24
       24
        
       

     

       25
       25
        
         enableParallelBuilding = true;

     
···

       29
       29
        
             sha256 = "15mrvw43s4frk1j49qr4v5viq68h8qlf10qs6ghd6mrsmgj5vddi";

     

       30
       30
        
         };

     

       31
       31
        
       

     

       32
       32
       -
         passthru = { gcc = stdenv.gcc.gcc; };

     

       32
       32
       +
         passthru = { gcc = stdenv.cc.gcc; };

     

       33
       33
        
       

     

       34
       34
        
         meta = {

     

       35
       35
        
           homepage = http://clang.llvm.org/;

+3 -7

pkgs/development/compilers/llvm/3.4/clang.nix

···

       1
       1
        
       { stdenv, fetch, cmake, libxml2, libedit, llvm, version, clang-tools-extra_src }:

     

       2
       2
        
       

     

       3
       3
       -
       # be sure not to rebuild clang on darwin; some packages request it specifically

     

       4
       4
       -
       # we need to fix those

     

       5
       5
       -
       assert stdenv.isDarwin -> stdenv.gcc.nativeTools;

     

       6
       6
       -
       

     

       7
       3
        
       stdenv.mkDerivation {

     

       8
       4
        
         name = "clang-${version}";

     

       9
       5
        
       

     
···

       28
       24
        
           "-DCMAKE_CXX_FLAGS=-std=c++11"

     

       29
       25
        
           "-DCLANG_PATH_TO_LLVM_BUILD=${llvm}"

     

       30
       26
        
         ] ++

     

       31
       31
       -
         (stdenv.lib.optional (stdenv.gcc.libc != null) "-DC_INCLUDE_DIRS=${stdenv.gcc.libc}/include") ++

     

       32
       32
       -
         (stdenv.lib.optional (stdenv.gcc.gcc != null) "-DGCC_INSTALL_PREFIX=${stdenv.gcc.gcc}");

     

       27
       27
       +
         (stdenv.lib.optional (stdenv.cc.libc != null) "-DC_INCLUDE_DIRS=${stdenv.cc.libc}/include") ++

     

       28
       28
       +
         (stdenv.lib.optional (stdenv.cc.gcc != null) "-DGCC_INSTALL_PREFIX=${stdenv.cc.gcc}");

     

       33
       29
        
       

     

       34
       30
        
         # Clang expects to find LLVMgold in its own prefix

     

       35
       31
        
         # Clang expects to find sanitizer libraries in its own prefix

     
···

       38
       34
        
           ln -sv ${llvm}/lib/clang/${version}/lib $out/lib/clang/${version}/

     

       39
       35
        
         '';

     

       40
       36
        
       

     

       41
       41
       -
         passthru.gcc = stdenv.gcc.gcc;

     

       37
       37
       +
         passthru.gcc = stdenv.cc.gcc;

     

       42
       38
        
       

     

       43
       39
        
         enableParallelBuilding = true;

     

       44
       40

+1 -1

pkgs/development/compilers/mentor/default.nix

···

       18
       18
        
               tar --strip-components=1 -xjf "$src" -C "$out"

     

       19
       19
        
       

     

       20
       20
        
               # Patch binaries

     

       21
       21
       -
               interpreter="$(cat "$NIX_GCC"/nix-support/dynamic-linker)"

     

       21
       21
       +
               interpreter="$(cat "$NIX_CC"/nix-support/dynamic-linker)"

     

       22
       22
        
               for file in "$out"/bin/* "$out"/libexec/gcc/*/*/* "$out"/*/bin/*; do

     

       23
       23
        
                   # Skip non-executable files

     

       24
       24
        
                   case "$file" in

+1 -1

pkgs/development/compilers/mozart/builder.sh

···

       14
       14
        
       for f in $out/bin/*; do

     

       15
       15
        
         b=$(basename $f)

     

       16
       16
        
         if [ $b == "ozemulator" ] || [ $b == "ozwish" ]; then

     

       17
       17
       -
            patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \

     

       17
       17
       +
            patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \

     

       18
       18
        
       	 --set-rpath $libPath \

     

       19
       19
        
       	 $f

     

       20
       20
        
           continue;

+1 -1

pkgs/development/compilers/opendylan/bin.nix

···

       21
       21
        
           mkdir -p "$out"

     

       22
       22
        
           tar --strip-components=1 -xjf "$src" -C "$out"

     

       23
       23
        
       

     

       24
       24
       -
           interpreter="$(cat "$NIX_GCC"/nix-support/dynamic-linker)"

     

       24
       24
       +
           interpreter="$(cat "$NIX_CC"/nix-support/dynamic-linker)"

     

       25
       25
        
           for a in "$out"/bin/*; do 

     

       26
       26
        
             patchelf --set-interpreter "$interpreter" "$a"

     

       27
       27
        
             patchelf --set-rpath "$out/lib:${boehmgc}/lib" "$a"

+2 -2

pkgs/development/compilers/oraclejdk/dlj-bundle-builder.sh

···

       5
       5
        
       

     

       6
       6
        
       # set the dynamic linker of unpack200, necessary for construct script

     

       7
       7
        
       echo "patching unpack200"

     

       8
       8
       -
       patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" --set-rpath "" */bin/unpack200

     

       8
       8
       +
       patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "" */bin/unpack200

     

       9
       9
        
       

     

       10
       10
        
       echo "constructing JDK and JRE installations"

     

       11
       11
        
       if test -z "$installjdk"; then

     
···

       46
       46
        
       

     

       47
       47
        
       # set all the dynamic linkers

     

       48
       48
        
       find $out -type f -perm +100 \

     

       49
       49
       -
           -exec patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \

     

       49
       49
       +
           -exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \

     

       50
       50
        
           --set-rpath "$rpath" {} \;

     

       51
       51
        
       

     

       52
       52
        
       find $out -name "*.so" -exec patchelf --set-rpath "$rpath" {} \;

+3 -3

pkgs/development/compilers/oraclejdk/jdk-linux-base.nix

···

       143
       143
        
       

     

       144
       144
        
           # set all the dynamic linkers

     

       145
       145
        
           find $out -type f -perm +100 \

     

       146
       146
       -
               -exec patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \

     

       146
       146
       +
               -exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \

     

       147
       147
        
               --set-rpath "$rpath" {} \;

     

       148
       148
        
       

     

       149
       149
        
           find $out -name "*.so" -exec patchelf --set-rpath "$rpath" {} \;

     
···

       173
       173
        
          * libXt is only needed on amd64

     

       174
       174
        
          */

     

       175
       175
        
         libraries =

     

       176
       176
       -
           [stdenv.gcc.libc glib libxml2 libav_0_8 ffmpeg libxslt mesa_noglu xlibs.libXxf86vm alsaLib fontconfig freetype gnome.pango gnome.gtk cairo gdk_pixbuf atk] ++

     

       177
       177
       -
           (if swingSupport then [xlibs.libX11 xlibs.libXext xlibs.libXtst xlibs.libXi xlibs.libXp xlibs.libXt xlibs.libXrender stdenv.gcc.gcc] else []);

     

       176
       176
       +
           [stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg libxslt mesa_noglu xlibs.libXxf86vm alsaLib fontconfig freetype gnome.pango gnome.gtk cairo gdk_pixbuf atk] ++

     

       177
       177
       +
           (if swingSupport then [xlibs.libX11 xlibs.libXext xlibs.libXtst xlibs.libXi xlibs.libXp xlibs.libXt xlibs.libXrender stdenv.cc.gcc] else []);

     

       178
       178
        
       

     

       179
       179
        
         passthru.mozillaPlugin = if installjdk then "/jre/lib/${architecture}/plugins" else "/lib/${architecture}/plugins";

     

       180
       180

+1 -1

pkgs/development/compilers/oraclejdk/jdk6-linux.nix

···

       72
       72
        
          * libXt is only needed on amd64

     

       73
       73
        
          */

     

       74
       74
        
         libraries =

     

       75
       75
       -
           [stdenv.gcc.libc] ++

     

       75
       75
       +
           [stdenv.cc.libc] ++

     

       76
       76
        
           (if swingSupport then [xlibs.libX11 xlibs.libXext xlibs.libXtst xlibs.libXi xlibs.libXp xlibs.libXt] else []);

     

       77
       77
        
       

     

       78
       78
        
         inherit swingSupport pluginSupport architecture jce;

+2 -2

pkgs/development/compilers/path64/default.nix

···

       13
       13
        
       

     

       14
       14
        
         patchPhase = ''

     

       15
       15
        
           sed -i s,/usr/bin/ld,$(type -P ld), src/driver/phases.c

     

       16
       16
       -
           sed -i s,/lib64/ld-linux-x86-64.so.2,${stdenv.gcc.libc}/lib/ld-linux-x86-64.so.2, src/include/main_defs.h.in

     

       16
       16
       +
           sed -i s,/lib64/ld-linux-x86-64.so.2,${stdenv.cc.libc}/lib/ld-linux-x86-64.so.2, src/include/main_defs.h.in

     

       17
       17
        
         '';

     

       18
       18
        
       

     

       19
       19
        
         cmakeFlags = ''

     
···

       22
       22
        
           -DPATH64_ENABLE_PSCRUNTIME=OFF

     

       23
       23
        
           -DPATH64_ENABLE_PROFILING=OFF -DPATH64_ENABLE_TARGETS=x8664 

     

       24
       24
        
           -DCMAKE_BUILD_TYPE=Debug -DPATH64_ENABLE_FORTRAN=OFF

     

       25
       25
       -
           -DPSC_CRT_PATH=${stdenv.gcc.libc}/lib

     

       25
       25
       +
           -DPSC_CRT_PATH=${stdenv.cc.libc}/lib

     

       26
       26
        
         '';

     

       27
       27
        
       

     

       28
       28
        
         makeFlags = "-j4";

+6 -7

pkgs/development/compilers/rustc/0.12.nix

···

       1
       1
        
       {stdenv, fetchurl, which, file, perl, curl, python27, makeWrapper}:

     

       2
       2
        
       

     

       3
       3
       -
       assert stdenv.gcc.gcc != null;

     

       4
       4
       -
       

     

       5
       3
        
       /* Rust's build process has a few quirks :

     

       6
       4
        
       

     

       7
       5
        
       - It requires some patched in llvm that haven't landed upstream, so it

     
···

       53
       51
        
             mkdir -p "$out"

     

       54
       52
        
             cp -r bin "$out/bin"

     

       55
       53
        
           '' + (if stdenv.isLinux then ''

     

       56
       56
       -
             patchelf --interpreter "${stdenv.glibc}/lib/${stdenv.gcc.dynamicLinker}" \

     

       57
       57
       -
                      --set-rpath "${stdenv.gcc.gcc}/lib/:${stdenv.gcc.gcc}/lib64/" \

     

       54
       54
       +
             patchelf --interpreter "${stdenv.glibc}/lib/${stdenv.cc.dynamicLinker}" \

     

       55
       55
       +
                      --set-rpath "${stdenv.cc.gcc}/lib/:${stdenv.cc.gcc}/lib64/" \

     

       58
       56
        
                      "$out/bin/rustc"

     

       59
       57
        
           '' else "");

     

       60
       58
        
         };

     

       61
       59
        
       

     

       62
       62
       -
         configureFlags = [ "--enable-local-rust" "--local-rust-root=$snapshot" ];

     

       60
       60
       +
         configureFlags = [ "--enable-local-rust" "--local-rust-root=$snapshot" ]

     

       61
       61
       +
                       ++ stdenv.lib.optional (stdenv.cc ? clang) "--enable-clang";

     

       63
       62
        
       

     

       64
       63
        
         # The compiler requires cc, so we patch the source to tell it where to find it

     

       65
       64
        
         patches = [ ./hardcode_paths.patch ./local_stage0.patch ];

     

       66
       65
        
         postPatch = ''

     

       67
       66
        
           substituteInPlace src/librustc/back/link.rs \

     

       68
       68
       -
             --subst-var-by "ccPath" "${stdenv.gcc}/bin/cc"

     

       67
       67
       +
             --subst-var-by "ccPath" "${stdenv.cc}/bin/cc"

     

       69
       68
        
           substituteInPlace src/librustc_back/archive.rs \

     

       70
       70
       -
             --subst-var-by "arPath" "${stdenv.gcc.binutils}/bin/ar"

     

       69
       69
       +
             --subst-var-by "arPath" "${stdenv.cc.binutils}/bin/ar"

     

       71
       70
        
         '';

     

       72
       71
        
       

     

       73
       72
        
         buildInputs = [ which file perl curl python27 makeWrapper ];

+6 -7

pkgs/development/compilers/rustc/head.nix

···

       2
       2
        
       , tzdata, git, valgrind, procps, coreutils

     

       3
       3
        
       }:

     

       4
       4
        
       

     

       5
       5
       -
       assert stdenv.gcc.gcc != null;

     

       6
       6
       -
       

     

       7
       5
        
       /* Rust's build process has a few quirks :

     

       8
       6
        
       

     

       9
       7
        
       - It requires some patched in llvm that haven't landed upstream, so it

     
···

       56
       54
        
             mkdir -p "$out"

     

       57
       55
        
             cp -r bin "$out/bin"

     

       58
       56
        
           '' + (if stdenv.isLinux then ''

     

       59
       59
       -
             patchelf --interpreter "${stdenv.glibc}/lib/${stdenv.gcc.dynamicLinker}" \

     

       60
       60
       -
                      --set-rpath "${stdenv.gcc.gcc}/lib/:${stdenv.gcc.gcc}/lib64/" \

     

       57
       57
       +
             patchelf --interpreter "${stdenv.glibc}/lib/${stdenv.cc.dynamicLinker}" \

     

       58
       58
       +
                      --set-rpath "${stdenv.cc.gcc}/lib/:${stdenv.cc.gcc}/lib64/" \

     

       61
       59
        
                      "$out/bin/rustc"

     

       62
       60
        
           '' else "");

     

       63
       61
        
         };

     

       64
       62
        
       

     

       65
       65
       -
         configureFlags = [ "--enable-local-rust" "--local-rust-root=$snapshot" ];

     

       63
       63
       +
         configureFlags = [ "--enable-local-rust" "--local-rust-root=$snapshot" ]

     

       64
       64
       +
                       ++ stdenv.lib.optional (stdenv.cc ? clang) "--enable-clang";

     

       66
       65
        
       

     

       67
       66
        
         # The compiler requires cc, so we patch the source to tell it where to find it

     

       68
       67
        
         patches = [ ./hardcode_paths.HEAD.patch ./local_stage0.HEAD.patch ]

     
···

       70
       69
        
       

     

       71
       70
        
         postPatch = ''

     

       72
       71
        
           substituteInPlace src/librustc_trans/back/link.rs \

     

       73
       73
       -
             --subst-var-by "ccPath" "${stdenv.gcc}/bin/cc"

     

       72
       72
       +
             --subst-var-by "ccPath" "${stdenv.cc}/bin/cc"

     

       74
       73
        
           substituteInPlace src/librustc_back/archive.rs \

     

       75
       75
       -
             --subst-var-by "arPath" "${stdenv.gcc.binutils}/bin/ar"

     

       74
       74
       +
             --subst-var-by "arPath" "${stdenv.cc.binutils}/bin/ar"

     

       76
       75
        
       

     

       77
       76
        
           substituteInPlace src/rust-installer/gen-install-script.sh \

     

       78
       77
        
             --replace /bin/echo "${coreutils}/bin/echo"

+3

pkgs/development/compilers/sbcl/1.2.0.nix

···

       47
       47
        
       

     

       48
       48
        
           sed -e '5,$d' -i contrib/sb-bsd-sockets/tests.lisp

     

       49
       49
        
           sed -e '5,$d' -i contrib/sb-simple-streams/*test*.lisp

     

       50
       50
       +
       

     

       51
       51
       +
           # Use whatever `cc` the stdenv provides

     

       52
       52
       +
           substituteInPlace src/runtime/Config.x86-64-darwin --replace gcc cc

     

       50
       53
        
         '';

     

       51
       54
        
       

     

       52
       55
        
         preBuild = ''

+3

pkgs/development/compilers/sbcl/default.nix

···

       50
       50
        
       

     

       51
       51
        
           sed -e '5,$d' -i contrib/sb-bsd-sockets/tests.lisp

     

       52
       52
        
           sed -e '5,$d' -i contrib/sb-simple-streams/*test*.lisp

     

       53
       53
       +
       

     

       54
       54
       +
           # Use whatever `cc` the stdenv provides

     

       55
       55
       +
           substituteInPlace src/runtime/Config.x86-64-darwin --replace gcc cc

     

       53
       56
        
         '';

     

       54
       57
        
       

     

       55
       58
        
         preBuild = ''

+1 -1

pkgs/development/compilers/tinycc/default.nix

···

       18
       18
        
         '';

     

       19
       19
        
       

     

       20
       20
        
         preConfigure = ''

     

       21
       21
       -
           configureFlagsArray+=("--elfinterp=$(cat $NIX_GCC/nix-support/dynamic-linker)")

     

       21
       21
       +
           configureFlagsArray+=("--elfinterp=$(cat $NIX_CC/nix-support/dynamic-linker)")

     

       22
       22
        
           configureFlagsArray+=("--crtprefix=${stdenv.glibc}/lib")

     

       23
       23
        
           configureFlagsArray+=("--sysincludepaths=${stdenv.glibc}/include:{B}/include")

     

       24
       24
        
           configureFlagsArray+=("--libpaths=${stdenv.glibc}/lib")

+2 -2

pkgs/development/compilers/urweb/default.nix

···

       10
       10
        
           sha256 = "077yakksxvdjlmwgc9wlz9jnkr345sikqjchvmxyv0axga5bw4rj";

     

       11
       11
        
         };

     

       12
       12
        
       

     

       13
       13
       -
         buildInputs = [ stdenv.gcc file openssl mlton mysql postgresql sqlite ];

     

       13
       13
       +
         buildInputs = [ stdenv.cc file openssl mlton mysql postgresql sqlite ];

     

       14
       14
        
       

     

       15
       15
        
         prePatch = ''

     

       16
       16
        
           sed -e 's@/usr/bin/file@${file}/bin/file@g' -i configure

     
···

       18
       18
        
       

     

       19
       19
        
         preConfigure =

     

       20
       20
        
           ''

     

       21
       21
       -
             export CC="${stdenv.gcc}/bin/gcc";

     

       21
       21
       +
             export CC="${stdenv.cc}/bin/gcc";

     

       22
       22
        
             export CCARGS="-I$out/include \

     

       23
       23
        
                             -L${mysql}/lib/mysql -L${postgresql}/lib -L${sqlite}/lib";

     

       24
       24

+2 -2

pkgs/development/guile-modules/guile-lib/default.nix

···

       1
       1
        
       {stdenv, fetchurl, guile, texinfo}:

     

       2
       2
        
       

     

       3
       3
       -
       assert stdenv ? gcc && stdenv.gcc ? gcc && stdenv.gcc.gcc != null;

     

       3
       3
       +
       assert stdenv ? cc && stdenv.cc ? gcc && stdenv.cc.gcc != null;

     

       4
       4
        
       

     

       5
       5
        
       stdenv.mkDerivation rec {

     

       6
       6
        
         name = "guile-lib-0.2.2";

     
···

       16
       16
        
       

     

       17
       17
        
         preCheck =

     

       18
       18
        
           # Make `libgcc_s.so' visible for `pthread_cancel'.

     

       19
       19
       -
           '' export LD_LIBRARY_PATH="$(dirname $(echo ${stdenv.gcc.gcc}/lib*/libgcc_s.so)):$LD_LIBRARY_PATH"

     

       19
       19
       +
           '' export LD_LIBRARY_PATH="$(dirname $(echo ${stdenv.cc.gcc}/lib*/libgcc_s.so)):$LD_LIBRARY_PATH"

     

       20
       20
        
           '';

     

       21
       21
        
       

     

       22
       22
        
         meta = {

+2 -2

pkgs/development/interpreters/dart/default.nix

···

       9
       9
        
           mkdir -p $out

     

       10
       10
        
           cp -R * $out/

     

       11
       11
        
           echo $libPath

     

       12
       12
       -
           patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \

     

       12
       12
       +
           patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \

     

       13
       13
        
                    --set-rpath $libPath \

     

       14
       14
        
                    $out/bin/dart

     

       15
       15
        
           

     
···

       33
       33
        
               sha256 = "00935c4vxfj2h3x354g75qdazswwissbwc7kj5k05l1m3lizikf6";

     

       34
       34
        
             };

     

       35
       35
        
        

     

       36
       36
       -
         libPath = stdenv.lib.makeLibraryPath [ stdenv.gcc.gcc ];

     

       36
       36
       +
         libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.gcc ];

     

       37
       37
        
        

     

       38
       38
        
         dontStrip = true;

     

       39
       39
        
       }

+4 -2

pkgs/development/interpreters/luajit/default.nix

···

       14
       14
        
         patchPhase = ''

     

       15
       15
        
           substituteInPlace Makefile \

     

       16
       16
        
             --replace /usr/local $out

     

       17
       17
       -
         '' + stdenv.lib.optionalString (stdenv.gcc.libc != null)

     

       17
       17
       +
       

     

       18
       18
       +
           substituteInPlace src/Makefile --replace gcc cc

     

       19
       19
       +
         '' + stdenv.lib.optionalString (stdenv.cc.libc != null)

     

       18
       20
        
         ''

     

       19
       21
        
           substituteInPlace Makefile \

     

       20
       20
       -
             --replace ldconfig ${stdenv.gcc.libc}/sbin/ldconfig

     

       22
       22
       +
             --replace ldconfig ${stdenv.cc.libc}/sbin/ldconfig

     

       21
       23
        
         '';

     

       22
       24
        
       

     

       23
       25
        
         configurePhase = false;

+2 -2

pkgs/development/interpreters/perl/5.16/default.nix

···

       2
       2
        
       

     

       3
       3
        
       let

     

       4
       4
        
       

     

       5
       5
       -
         libc = if stdenv.gcc.libc or null != null then stdenv.gcc.libc else "/usr";

     

       5
       5
       +
         libc = if stdenv.cc.libc or null != null then stdenv.cc.libc else "/usr";

     

       6
       6
        
       

     

       7
       7
        
       in

     

       8
       8
        
       

     
···

       60
       60
        
             ''}

     

       61
       61
        
           '';

     

       62
       62
        
       

     

       63
       63
       -
         preBuild = lib.optionalString (!(stdenv ? gcc && stdenv.gcc.nativeTools))

     

       63
       63
       +
         preBuild = lib.optionalString (!(stdenv ? cc && stdenv.cc.nativeTools))

     

       64
       64
        
           ''

     

       65
       65
        
             # Make Cwd work on NixOS (where we don't have a /bin/pwd).

     

       66
       66
        
             substituteInPlace dist/Cwd/Cwd.pm --replace "'/bin/pwd'" "'$(type -tP pwd)'"

+3 -3

pkgs/development/interpreters/perl/5.20/default.nix

···

       14
       14
        
       

     

       15
       15
        
       let

     

       16
       16
        
       

     

       17
       17
       -
         libc = if stdenv.gcc.libc or null != null then stdenv.gcc.libc else "/usr";

     

       17
       17
       +
         libc = if stdenv.cc.libc or null != null then stdenv.cc.libc else "/usr";

     

       18
       18
        
       

     

       19
       19
        
       in

     

       20
       20
        
       

     
···

       44
       44
        
         # Miniperl needs -lm. perl needs -lrt.

     

       45
       45
        
         configureFlags =

     

       46
       46
        
           [ "-de"

     

       47
       47
       -
             "-Dcc=gcc"

     

       47
       47
       +
             "-Dcc=cc"

     

       48
       48
        
             "-Uinstallusrbinperl"

     

       49
       49
        
             "-Dinstallstyle=lib/perl5"

     

       50
       50
        
             "-Duseshrplib"

     
···

       68
       68
        
             ''}

     

       69
       69
        
           '';

     

       70
       70
        
       

     

       71
       71
       -
         preBuild = optionalString (!(stdenv ? gcc && stdenv.gcc.nativeTools))

     

       71
       71
       +
         preBuild = optionalString (!(stdenv ? cc && stdenv.cc.nativeTools))

     

       72
       72
        
           ''

     

       73
       73
        
             # Make Cwd work on NixOS (where we don't have a /bin/pwd).

     

       74
       74
        
             substituteInPlace dist/PathTools/Cwd.pm --replace "'/bin/pwd'" "'$(type -tP pwd)'"

+2 -2

pkgs/development/interpreters/pypy/2.4/default.nix

···

       22
       22
        
           };

     

       23
       23
        
       

     

       24
       24
        
           buildInputs = [ bzip2 openssl pkgconfig pythonFull libffi ncurses expat sqlite tk tcl x11 libX11 makeWrapper ]

     

       25
       25
       -
             ++ stdenv.lib.optional (stdenv ? gcc && stdenv.gcc.libc != null) stdenv.gcc.libc

     

       25
       25
       +
             ++ stdenv.lib.optional (stdenv ? cc && stdenv.cc.libc != null) stdenv.cc.libc

     

       26
       26
        
             ++ stdenv.lib.optional zlibSupport zlib;

     

       27
       27
        
       

     

       28
       28
        
           C_INCLUDE_PATH = stdenv.lib.concatStringsSep ":" (map (p: "${p}/include") buildInputs);

     

       29
       29
        
           LIBRARY_PATH = stdenv.lib.concatStringsSep ":" (map (p: "${p}/lib") buildInputs);

     

       30
       30
        
           LD_LIBRARY_PATH = stdenv.lib.concatStringsSep ":" (map (p: "${p}/lib") 

     

       31
       31
       -
             (stdenv.lib.filter (x : x.outPath != stdenv.gcc.libc.outPath or "") buildInputs));

     

       31
       31
       +
             (stdenv.lib.filter (x : x.outPath != stdenv.cc.libc.outPath or "") buildInputs));

     

       32
       32
        
       

     

       33
       33
        
           preConfigure = ''

     

       34
       34
        
             substituteInPlace Makefile \

+1 -1

pkgs/development/interpreters/python/2.6/default.nix

···

       44
       44
        
           '';

     

       45
       45
        
       

     

       46
       46
        
         buildInputs =

     

       47
       47
       -
           optional (stdenv ? gcc && stdenv.gcc.libc != null) stdenv.gcc.libc ++

     

       47
       47
       +
           optional (stdenv ? cc && stdenv.cc.libc != null) stdenv.cc.libc ++

     

       48
       48
        
           [ bzip2 openssl ]++ optionals includeModules [ db openssl ncurses gdbm readline x11 tcl tk sqlite ]

     

       49
       49
        
           ++ optional zlibSupport zlib;

     

       50
       50

+1 -1

pkgs/development/interpreters/python/2.7/default.nix

···

       47
       47
        
           '';

     

       48
       48
        
       

     

       49
       49
        
         buildInputs =

     

       50
       50
       -
           optional (stdenv ? gcc && stdenv.gcc.libc != null) stdenv.gcc.libc ++

     

       50
       50
       +
           optional (stdenv ? cc && stdenv.cc.libc != null) stdenv.cc.libc ++

     

       51
       51
        
           [ bzip2 openssl ] ++ optionals includeModules [ db openssl ncurses gdbm libX11 readline x11 tcl tk sqlite ]

     

       52
       52
        
           ++ optional zlibSupport zlib;

     

       53
       53

+1 -1

pkgs/development/interpreters/xulrunner/default.nix

···

       7
       7
        
       , debugBuild ? false

     

       8
       8
        
       }:

     

       9
       9
        
       

     

       10
       10
       -
       assert stdenv.gcc ? libc && stdenv.gcc.libc != null;

     

       10
       10
       +
       assert stdenv.cc ? libc && stdenv.cc.libc != null;

     

       11
       11
        
       

     

       12
       12
        
       let version = firefox.version; in

     

       13
       13

+3 -1

pkgs/development/libraries/botan/generic.nix

···

       17
       17
        
         buildInputs = [ python bzip2 zlib gmp openssl boost ];

     

       18
       18
        
       

     

       19
       19
        
         configurePhase = ''

     

       20
       20
       -
           python configure.py --prefix=$out --with-gnump --with-bzip2 --with-zlib --with-openssl

     

       20
       20
       +
           python configure.py --prefix=$out --with-gnump --with-bzip2 --with-zlib --with-openssl --cc=$CC

     

       21
       21
        
         '';

     

       22
       22
       +
       

     

       23
       23
       +
         enableParallelBuilding = true;

     

       22
       24
        
       

     

       23
       25
        
         postInstall = ''

     

       24
       26
        
           cd "$out"/lib/pkgconfig

+1 -1

pkgs/development/libraries/fmod/default.nix

···

       5
       5
        
         bits = stdenv.lib.optionalString (stdenv.system == "x86_64-linux") "64";

     

       6
       6
        
       

     

       7
       7
        
         libPath = stdenv.lib.makeLibraryPath

     

       8
       8
       -
           [ stdenv.gcc.libc stdenv.gcc.gcc ] + ":${stdenv.gcc.gcc}/lib64";

     

       8
       8
       +
           [ stdenv.cc.libc stdenv.cc.gcc ] + ":${stdenv.cc.gcc}/lib64";

     

       9
       9
        
         patchLib = x: "patchelf --set-rpath ${libPath} ${x}";

     

       10
       10
        
       in

     

       11
       11
        
       stdenv.mkDerivation rec {

+2 -2

pkgs/development/libraries/gettext/default.nix

···

       35
       35
        
         enableParallelBuilding = true;

     

       36
       36
        
       

     

       37
       37
        
         crossAttrs = {

     

       38
       38
       -
           buildInputs = stdenv.lib.optional (stdenv.gccCross.libc ? libiconv)

     

       39
       39
       -
             stdenv.gccCross.libc.libiconv.crossDrv;

     

       38
       38
       +
           buildInputs = stdenv.lib.optional (stdenv.ccCross.libc ? libiconv)

     

       39
       39
       +
             stdenv.ccCross.libc.libiconv.crossDrv;

     

       40
       40
        
           # Gettext fails to guess the cross compiler

     

       41
       41
        
           configureFlags = "CXX=${stdenv.cross.config}-g++";

     

       42
       42
        
         };

+2 -2

pkgs/development/libraries/glib/default.nix

···

       7
       7
        
       

     

       8
       8
        
       with stdenv.lib;

     

       9
       9
        
       

     

       10
       10
       -
       assert stdenv.gcc.gcc != null;

     

       10
       10
       +
       assert !stdenv.isDarwin -> stdenv.cc ? gcc;

     

       11
       11
        
       

     

       12
       12
        
       # TODO:

     

       13
       13
        
       # * Add gio-module-fam

     
···

       83
       83
        
         preCheck = optionalString doCheck

     

       84
       84
        
           # libgcc_s.so.1 must be installed for pthread_cancel to work

     

       85
       85
        
           # also point to the glib/.libs path

     

       86
       86
       -
           '' export LD_LIBRARY_PATH="${stdenv.gcc.gcc}/lib:$NIX_BUILD_TOP/${name}/glib/.libs:$LD_LIBRARY_PATH"

     

       86
       86
       +
           '' export LD_LIBRARY_PATH="${stdenv.cc.gcc}/lib:$NIX_BUILD_TOP/${name}/glib/.libs:$LD_LIBRARY_PATH"

     

       87
       87
        
              export TZDIR="${tzdata}/share/zoneinfo"

     

       88
       88
        
              export XDG_CACHE_HOME="$TMP"

     

       89
       89
        
              export XDG_RUNTIME_HOME="$TMP"

+2 -2

pkgs/development/libraries/glibc/common.nix

···

       167
       167
        
       

     

       168
       168
        
           configureScript="`pwd`/../$sourceRoot/configure"

     

       169
       169
        
       

     

       170
       170
       -
           ${stdenv.lib.optionalString (stdenv.gcc.libc != null)

     

       171
       171
       -
             ''makeFlags="$makeFlags BUILD_LDFLAGS=-Wl,-rpath,${stdenv.gcc.libc}/lib"''

     

       170
       170
       +
           ${stdenv.lib.optionalString (stdenv.cc.libc != null)

     

       171
       171
       +
             ''makeFlags="$makeFlags BUILD_LDFLAGS=-Wl,-rpath,${stdenv.cc.libc}/lib"''

     

       172
       172
        
           }

     

       173
       173
        
       

     

       174
       174
        
           ${preConfigure}

+3 -3

pkgs/development/libraries/glibc/default.nix

···

       8
       8
        
       , withGd ? false, gd ? null, libpng ? null

     

       9
       9
        
       }:

     

       10
       10
        
       

     

       11
       11
       -
       assert stdenv.gcc.gcc != null;

     

       11
       11
       +
       assert stdenv.cc ? gcc;

     

       12
       12
        
       

     

       13
       13
        
       let

     

       14
       14
        
         build = import ./common.nix;

     
···

       33
       33
        
           # libgcc_s will not be at {gcc}/lib, and gcc's libgcc will be found without

     

       34
       34
        
           # any special hack.

     

       35
       35
        
           preInstall = ''

     

       36
       36
       -
             if [ -f ${stdenv.gcc.gcc}/lib/libgcc_s.so.1 ]; then

     

       36
       36
       +
             if [ -f ${stdenv.cc.gcc}/lib/libgcc_s.so.1 ]; then

     

       37
       37
        
                 mkdir -p $out/lib

     

       38
       38
       -
                 cp ${stdenv.gcc.gcc}/lib/libgcc_s.so.1 $out/lib/libgcc_s.so.1

     

       38
       38
       +
                 cp ${stdenv.cc.gcc}/lib/libgcc_s.so.1 $out/lib/libgcc_s.so.1

     

       39
       39
        
             fi

     

       40
       40
        
           '';

     

       41
       41

+1 -1

pkgs/development/libraries/haskell/cuda/default.nix

···

       9
       9
        
         isLibrary = true;

     

       10
       10
        
         isExecutable = true;

     

       11
       11
        
         buildTools = [ c2hs ];

     

       12
       12
       -
         extraLibraries = [ cudatoolkit nvidia_x11 self.stdenv.gcc ];

     

       12
       12
       +
         extraLibraries = [ cudatoolkit nvidia_x11 self.stdenv.cc ];

     

       13
       13
        
         doCheck = false;

     

       14
       14
        
         # Perhaps this should be the default in cabal.nix ...

     

       15
       15
        
         #

+1 -1

pkgs/development/libraries/libedit/default.nix

···

       12
       12
        
         NROFF = "${groff}/bin/nroff";

     

       13
       13
        
       

     

       14
       14
        
         postInstall = ''

     

       15
       15
       -
           sed -i ${stdenv.lib.optionalString (stdenv.isDarwin && stdenv.gcc.nativeTools) "''"} s/-lncurses/-lncursesw/g $out/lib/pkgconfig/libedit.pc

     

       15
       15
       +
           sed -i ${stdenv.lib.optionalString (stdenv.isDarwin && stdenv.cc.nativeTools) "''"} s/-lncurses/-lncursesw/g $out/lib/pkgconfig/libedit.pc

     

       16
       16
        
         '';

     

       17
       17
        
       

     

       18
       18
        
         configureFlags = [ "--enable-widec" ];

+1 -1

pkgs/development/libraries/libopensc-dnie/default.nix

···

       22
       22
        
           ar x opensc-dnie*

     

       23
       23
        
           tar xf data.tar.gz

     

       24
       24
        
       

     

       25
       25
       -
           RPATH=${glib}/lib:${opensc}/lib:${openssl}/lib:${openct}/lib:${libtool}/lib:${pcsclite}/lib:${stdenv.gcc.libc}/lib:${zlib}/lib

     

       25
       25
       +
           RPATH=${glib}/lib:${opensc}/lib:${openssl}/lib:${openct}/lib:${libtool}/lib:${pcsclite}/lib:${stdenv.cc.libc}/lib:${zlib}/lib

     

       26
       26
        
       

     

       27
       27
        
           for a in "usr/lib/"*.so*; do

     

       28
       28
        
               if ! test -L $a; then

+2 -2

pkgs/development/libraries/libre/default.nix

···

       11
       11
        
           "USE_ZLIB=1" "USE_OPENSSL=1" 

     

       12
       12
        
           ''PREFIX=$(out)''

     

       13
       13
        
         ]

     

       14
       14
       -
         ++ stdenv.lib.optional (stdenv.gcc.gcc != null) "SYSROOT_ALT=${stdenv.gcc.gcc}"

     

       15
       15
       -
         ++ stdenv.lib.optional (stdenv.gcc.libc != null) "SYSROOT=${stdenv.gcc.libc}"

     

       14
       14
       +
         ++ stdenv.lib.optional (stdenv.cc.gcc != null) "SYSROOT_ALT=${stdenv.cc.gcc}"

     

       15
       15
       +
         ++ stdenv.lib.optional (stdenv.cc.libc != null) "SYSROOT=${stdenv.cc.libc}"

     

       16
       16
        
         ;

     

       17
       17
        
         meta = {

     

       18
       18
        
           homepage = "http://www.creytiv.com/re.html";

+2 -2

pkgs/development/libraries/librem/default.nix

···

       12
       12
        
           "LIBRE_INC=${libre}/include/re"

     

       13
       13
        
           ''PREFIX=$(out)''

     

       14
       14
        
         ]

     

       15
       15
       -
         ++ stdenv.lib.optional (stdenv.gcc.gcc != null) "SYSROOT_ALT=${stdenv.gcc.gcc}"

     

       16
       16
       -
         ++ stdenv.lib.optional (stdenv.gcc.libc != null) "SYSROOT=${stdenv.gcc.libc}"

     

       15
       15
       +
         ++ stdenv.lib.optional (stdenv.cc.gcc != null) "SYSROOT_ALT=${stdenv.cc.gcc}"

     

       16
       16
       +
         ++ stdenv.lib.optional (stdenv.cc.libc != null) "SYSROOT=${stdenv.cc.libc}"

     

       17
       17
        
         ;

     

       18
       18
        
         meta = {

     

       19
       19
        
           homepage = "http://www.creytiv.com/rem.html";

+1 -1

pkgs/development/libraries/libvncserver/default.nix

···

       29
       29
        
           inherit (s) url sha256;

     

       30
       30
        
         };

     

       31
       31
        
         preConfigure = ''

     

       32
       32
       -
           sed -e 's@/usr/include/linux@${stdenv.gcc.libc}/include/linux@g' -i configure

     

       32
       32
       +
           sed -e 's@/usr/include/linux@${stdenv.cc.libc}/include/linux@g' -i configure

     

       33
       33
        
         '';

     

       34
       34
        
         meta = {

     

       35
       35
        
           inherit (s) version;

+2

pkgs/development/libraries/pdf2xml/default.nix

···

       21
       21
        
           sed -i 's|XPDF = xpdf_3.01|XPDF = ${libxpdf}/lib|' Makefile

     

       22
       22
        
       

     

       23
       23
        
           mkdir exe

     

       24
       24
       +
       

     

       25
       25
       +
           buildFlags+=" CXX=$CXX"

     

       24
       26
        
         '';

     

       25
       27
        
         

     

       26
       28
        
         installPhase = ''

+2 -2

pkgs/development/libraries/podofo/default.nix

···

       11
       11
        
       

     

       12
       12
        
         propagatedBuildInputs = [ zlib freetype libjpeg libtiff fontconfig openssl libpng ];

     

       13
       13
        
         nativeBuildInputs = [ cmake ];

     

       14
       14
       -
         buildInputs = [ lua5 stdenv.gcc.libc ];

     

       14
       14
       +
         buildInputs = [ lua5 stdenv.cc.libc ];

     

       15
       15
        
       

     

       16
       16
        
         crossAttrs = {

     

       17
       17
        
           propagatedBuildInputs = [ zlib.crossDrv freetype.crossDrv libjpeg.crossDrv

     

       18
       18
        
             libtiff.crossDrv fontconfig.crossDrv openssl.crossDrv libpng.crossDrv

     

       19
       19
       -
             lua5.crossDrv stdenv.gccCross.libc ];

     

       19
       19
       +
             lua5.crossDrv stdenv.ccCross.libc ];

     

       20
       20
        
         };

     

       21
       21
        
       

     

       22
       22
        
         # fix finding freetype-2.5

+2 -2

pkgs/development/libraries/qt-4.x/4.8/default.nix

···

       45
       45
        
           # remove impure reference to /usr/lib/libstdc++.6.dylib

     

       46
       46
        
           # there might be more references, but this is the only one I could find

     

       47
       47
        
           substituteInPlace tools/macdeployqt/tests/tst_deployment_mac.cpp \

     

       48
       48
       -
             --replace /usr/lib/libstdc++.6.dylib "${stdenv.gcc}/lib/libstdc++.6.dylib"

     

       48
       48
       +
             --replace /usr/lib/libstdc++.6.dylib "${stdenv.cc}/lib/libstdc++.6.dylib"

     

       49
       49
        
         '';

     

       50
       50
        
       

     

       51
       51
        
         patches =

     
···

       53
       53
        
             (substituteAll {

     

       54
       54
        
               src = ./dlopen-absolute-paths.diff;

     

       55
       55
        
               inherit cups icu libXfixes;

     

       56
       56
       -
               glibc = stdenv.gcc.libc;

     

       56
       56
       +
               glibc = stdenv.cc.libc;

     

       57
       57
        
               openglDriver = if mesaSupported then mesa.driverLink else "/no-such-path";

     

       58
       58
        
             })

     

       59
       59
        
           ] ++ stdenv.lib.optional gtkStyle (substituteAll {

+2 -2

pkgs/development/libraries/scmccid/default.nix

···

       1
       1
        
       {stdenv, fetchurl, patchelf, libusb}:

     

       2
       2
        
       

     

       3
       3
       -
       assert stdenv ? gcc && stdenv.gcc.libc != null;

     

       3
       3
       +
       assert stdenv ? cc && stdenv.cc.libc != null;

     

       4
       4
        
       

     

       5
       5
        
       stdenv.mkDerivation rec {

     

       6
       6
        
         name = "scmccid-5.0.11";

     
···

       18
       18
        
         buildInputs = [ patchelf ];

     

       19
       19
        
       

     

       20
       20
        
         installPhase = ''

     

       21
       21
       -
           RPATH=${libusb}/lib:${stdenv.gcc.libc}/lib

     

       21
       21
       +
           RPATH=${libusb}/lib:${stdenv.cc.libc}/lib

     

       22
       22
        
       

     

       23
       23
        
           for a in proprietary/*/Contents/Linux/*.so*; do

     

       24
       24
        
               if ! test -L $a; then

+1 -1

pkgs/development/libraries/serf/default.nix

···

       19
       19
        
         buildPhase = ''

     

       20
       20
        
           scons PREFIX="$out" OPENSSL="${openssl}" ZLIB="${zlib}" APR="$(echo "${apr}"/bin/*-config)" \

     

       21
       21
        
               APU="$(echo "${aprutil}"/bin/*-config)" GSSAPI="${krb5}" CC="${

     

       22
       22
       -
                 if stdenv.isDarwin then "clang" else "${stdenv.gcc}/bin/gcc"

     

       22
       22
       +
                 if stdenv.isDarwin then "clang" else "${stdenv.cc}/bin/gcc"

     

       23
       23
        
               }"

     

       24
       24
        
         '';

     

       25
       25

+1 -1

pkgs/development/libraries/strigi/default.nix

···

       16
       16
        
         CLUCENE_HOME = clucene_core;

     

       17
       17
        
       

     

       18
       18
        
         buildInputs =

     

       19
       19
       -
           [ zlib bzip2 stdenv.gcc.libc libxml2 qt4 exiv2 clucene_core fam dbus_tools ];

     

       19
       19
       +
           [ zlib bzip2 stdenv.cc.libc libxml2 qt4 exiv2 clucene_core fam dbus_tools ];

     

       20
       20
        
       

     

       21
       21
        
         nativeBuildInputs = [ cmake pkgconfig perl ];

     

       22
       22

+2 -2

pkgs/development/libraries/v8/default.nix

···

       57
       57
        
         '';

     

       58
       58
        
       

     

       59
       59
        
         postFixup = if stdenv.isDarwin then ''

     

       60
       60
       -
           install_name_tool -change /usr/local/lib/libv8.dylib $out/lib/libv8.dylib -change /usr/lib/libgcc_s.1.dylib ${stdenv.gcc.gcc}/lib/libgcc_s.1.dylib $out/bin/d8

     

       61
       61
       -
           install_name_tool -id $out/lib/libv8.dylib -change /usr/lib/libgcc_s.1.dylib ${stdenv.gcc.gcc}/lib/libgcc_s.1.dylib $out/lib/libv8.dylib

     

       60
       60
       +
           install_name_tool -change /usr/local/lib/libv8.dylib $out/lib/libv8.dylib -change /usr/lib/libgcc_s.1.dylib ${stdenv.cc.gcc}/lib/libgcc_s.1.dylib $out/bin/d8

     

       61
       61
       +
           install_name_tool -id $out/lib/libv8.dylib -change /usr/lib/libgcc_s.1.dylib ${stdenv.cc.gcc}/lib/libgcc_s.1.dylib $out/lib/libv8.dylib

     

       62
       62
        
         '' else null;

     

       63
       63
        
       

     

       64
       64
        
         meta = with stdenv.lib; {

+1 -1

pkgs/development/libraries/wtk/builder.sh

···

       22
       22
        
           rpath=$rpath${rpath:+:}$i/lib

     

       23
       23
        
       done

     

       24
       24
        
       find $out -type f -perm +100 \

     

       25
       25
       -
           -exec patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" {} \;

     

       25
       25
       +
           -exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" {} \;

     

       26
       26
        
       find $out -type f -perm +100 \

     

       27
       27
        
           -exec patchelf --set-rpath "$rpath" {} \;

+1 -1

pkgs/development/libraries/wtk/default.nix

···

       15
       15
        
       

     

       16
       16
        
         buildInputs = [ unzip ];

     

       17
       17
        
       

     

       18
       18
       -
         libraries = [ xlibs.libXpm xlibs.libXt xlibs.libX11 xlibs.libICE xlibs.libSM stdenv.gcc.gcc ];

     

       18
       18
       +
         libraries = [ xlibs.libXpm xlibs.libXt xlibs.libX11 xlibs.libICE xlibs.libSM stdenv.cc.gcc ];

     

       19
       19
        
       

     

       20
       20
        
         meta = {

     

       21
       21
        
           homepage = http://java.sun.com/products/sjwtoolkit/download.html;

+4 -4

pkgs/development/misc/amdapp-sdk/default.nix

···

       46
       46
        
       

     

       47
       47
        
         patchFlags = "-p0";

     

       48
       48
        
         buildInputs = [ makeWrapper perl mesa xorg.libX11 xorg.libXext xorg.libXaw xorg.libXi xorg.libXxf86vm ];

     

       49
       49
       -
         propagatedBuildInputs = [ stdenv.gcc ];

     

       49
       49
       +
         propagatedBuildInputs = [ stdenv.cc ];

     

       50
       50
        
         NIX_LDFLAGS = "-lX11 -lXext -lXmu -lXi -lXxf86vm";

     

       51
       51
        
         doCheck = false;

     

       52
       52
        
       

     
···

       81
       81
        
             cp -r "./samples/opencl/bin/${arch}/"* "$out/samples/opencl/bin"

     

       82
       82
        
             for f in $(find "$out/samples/opencl/bin/" -type f -not -name "*.*");

     

       83
       83
        
             do

     

       84
       84
       -
               wrapProgram "$f" --prefix PATH ":" "${stdenv.gcc}/bin"

     

       84
       84
       +
               wrapProgram "$f" --prefix PATH ":" "${stdenv.cc}/bin"

     

       85
       85
        
             done'' else ""

     

       86
       86
        
           }

     

       87
       87
        
       

     

       88
       88
        
           # Create wrappers

     

       89
       89
       -
           patchelf --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" $out/bin/clinfo

     

       90
       90
       -
           patchelf --set-rpath ${stdenv.gcc.gcc}/lib64:${stdenv.gcc.gcc}/lib $out/bin/clinfo

     

       89
       89
       +
           patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/bin/clinfo

     

       90
       90
       +
           patchelf --set-rpath ${stdenv.cc.gcc}/lib64:${stdenv.cc.gcc}/lib $out/bin/clinfo

     

       91
       91
        
       

     

       92
       92
        
           # Fix modes

     

       93
       93
        
           find "$out/" -type f -exec chmod 644 {} \;

+1 -1

pkgs/development/mobile/androidenv/androidndk.nix

···

       54
       54
        
           find $out \( \

     

       55
       55
        
               \( -type f -a -name "*.so*" \) -o \

     

       56
       56
        
               \( -type f -a -perm /0100 \) \

     

       57
       57
       -
               \) -exec patchelf --set-interpreter ${stdenv.gcc.libc}/lib/ld-*so.? \

     

       57
       57
       +
               \) -exec patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-*so.? \

     

       58
       58
        
                                 --set-rpath ${zlib}/lib:${ncurses}/lib {} \;

     

       59
       59
        
           # fix ineffective PROGDIR / MYNDKDIR determination

     

       60
       60
        
           for i in ndk-build ndk-gdb ndk-gdb-py

+6 -6

pkgs/development/mobile/androidenv/androidsdk.nix

···

       43
       43
        
               

     

       44
       44
        
               for i in emulator64-arm emulator64-mips emulator64-x86

     

       45
       45
        
               do

     

       46
       46
       -
                   patchelf --set-interpreter ${stdenv.gcc.libc}/lib/ld-linux-x86-64.so.2 $i

     

       47
       47
       -
                   patchelf --set-rpath ${stdenv.gcc.gcc}/lib64 $i

     

       46
       46
       +
                   patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux-x86-64.so.2 $i

     

       47
       47
       +
                   patchelf --set-rpath ${stdenv.cc.gcc}/lib64 $i

     

       48
       48
        
               done

     

       49
       49
        
             ''}

     

       50
       50
        
             

     
···

       80
       80
        
               # The monitor requires some more patching

     

       81
       81
        
               

     

       82
       82
        
               cd lib/monitor-x86

     

       83
       83
       -
               patchelf --set-interpreter ${stdenv.gcc.libc}/lib/ld-linux.so.2 monitor

     

       83
       83
       +
               patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux.so.2 monitor

     

       84
       84
        
               patchelf --set-rpath ${libX11}/lib:${libXext}/lib:${libXrender}/lib:${freetype}/lib:${fontconfig}/lib libcairo-swt.so

     

       85
       85
        
               

     

       86
       86
        
               wrapProgram `pwd`/monitor \

     

       87
       87
       -
                 --prefix LD_LIBRARY_PATH : ${gtk}/lib:${atk}/lib:${stdenv.gcc.gcc}/lib

     

       87
       87
       +
                 --prefix LD_LIBRARY_PATH : ${gtk}/lib:${atk}/lib:${stdenv.cc.gcc}/lib

     

       88
       88
        
       

     

       89
       89
        
               cd ../..

     

       90
       90
        
             ''

     
···

       93
       93
        
               # The monitor requires some more patching

     

       94
       94
        
               

     

       95
       95
        
               cd lib/monitor-x86_64

     

       96
       96
       -
               patchelf --set-interpreter ${stdenv.gcc.libc}/lib/ld-linux-x86-64.so.2 monitor

     

       96
       96
       +
               patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux-x86-64.so.2 monitor

     

       97
       97
        
               patchelf --set-rpath ${libX11}/lib:${libXext}/lib:${libXrender}/lib:${freetype}/lib:${fontconfig}/lib libcairo-swt.so

     

       98
       98
        
               

     

       99
       99
        
               wrapProgram `pwd`/monitor \

     

       100
       100
       -
                 --prefix LD_LIBRARY_PATH : ${gtk}/lib:${atk}/lib:${stdenv.gcc.gcc}/lib

     

       100
       100
       +
                 --prefix LD_LIBRARY_PATH : ${gtk}/lib:${atk}/lib:${stdenv.cc.gcc}/lib

     

       101
       101
        
       

     

       102
       102
        
               cd ../..

     

       103
       103
        
             ''

+1 -1

pkgs/development/mobile/flashtool/default.nix

···

       36
       36
        
           ln -s ${libusb1}/lib/libusb-1.0.so.0 ./x10flasher_lib/linux/lib32/libusbx-1.0.so

     

       37
       37
        
       

     

       38
       38
        
           chmod +x x10flasher_lib/unyaffs.linux.x86 x10flasher_lib/bin2elf x10flasher_lib/bin2sin

     

       39
       39
       -
           patchelf --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" x10flasher_lib/unyaffs.linux.x86

     

       39
       39
       +
           patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" x10flasher_lib/unyaffs.linux.x86

     

       40
       40
        
           ln -sf unyaffs.linux.x86 x10flasher_lib/unyaffs.linux

     

       41
       41
        
       

     

       42
       42
        
           ln -s swt32.jar x10flasher_lib/swtlin/swt.jar

+2 -2

pkgs/development/mobile/titaniumenv/titaniumsdk-3.1.nix

···

       45
       45
        
           

     

       46
       46
        
           ${if stdenv.system == "i686-linux" then

     

       47
       47
        
             ''

     

       48
       48
       -
               patchelf --set-interpreter ${stdenv.gcc.libc}/lib/ld-linux.so.2 titanium_prep.linux32

     

       48
       48
       +
               patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux.so.2 titanium_prep.linux32

     

       49
       49
        
             ''

     

       50
       50
        
             else if stdenv.system == "x86_64-linux" then

     

       51
       51
        
             ''

     

       52
       52
       -
               patchelf --set-interpreter ${stdenv.gcc.libc}/lib/ld-linux-x86-64.so.2 titanium_prep.linux64

     

       52
       52
       +
               patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux-x86-64.so.2 titanium_prep.linux64

     

       53
       53
        
             ''

     

       54
       54
        
             else ""}

     

       55
       55

+2 -2

pkgs/development/mobile/titaniumenv/titaniumsdk-3.2.nix

···

       44
       44
        
           

     

       45
       45
        
           ${if stdenv.system == "i686-linux" then

     

       46
       46
        
             ''

     

       47
       47
       -
               patchelf --set-interpreter ${stdenv.gcc.libc}/lib/ld-linux.so.2 titanium_prep.linux32

     

       47
       47
       +
               patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux.so.2 titanium_prep.linux32

     

       48
       48
        
             ''

     

       49
       49
        
             else if stdenv.system == "x86_64-linux" then

     

       50
       50
        
             ''

     

       51
       51
       -
               patchelf --set-interpreter ${stdenv.gcc.libc}/lib/ld-linux-x86-64.so.2 titanium_prep.linux64

     

       51
       51
       +
               patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux-x86-64.so.2 titanium_prep.linux64

     

       52
       52
        
             ''

     

       53
       53
        
             else ""}

     

       54
       54

+2 -2

pkgs/development/mobile/titaniumenv/titaniumsdk-3.3.nix

···

       44
       44
        
           

     

       45
       45
        
           ${if stdenv.system == "i686-linux" then

     

       46
       46
        
             ''

     

       47
       47
       -
               patchelf --set-interpreter ${stdenv.gcc.libc}/lib/ld-linux.so.2 titanium_prep.linux32

     

       47
       47
       +
               patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux.so.2 titanium_prep.linux32

     

       48
       48
        
             ''

     

       49
       49
        
             else if stdenv.system == "x86_64-linux" then

     

       50
       50
        
             ''

     

       51
       51
       -
               patchelf --set-interpreter ${stdenv.gcc.libc}/lib/ld-linux-x86-64.so.2 titanium_prep.linux64

     

       51
       51
       +
               patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux-x86-64.so.2 titanium_prep.linux64

     

       52
       52
        
             ''

     

       53
       53
        
             else ""}

     

       54
       54

+2 -2

pkgs/development/mobile/titaniumenv/titaniumsdk-3.4.nix

···

       44
       44
        
           

     

       45
       45
        
           ${if stdenv.system == "i686-linux" then

     

       46
       46
        
             ''

     

       47
       47
       -
               patchelf --set-interpreter ${stdenv.gcc.libc}/lib/ld-linux.so.2 titanium_prep.linux32

     

       47
       47
       +
               patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux.so.2 titanium_prep.linux32

     

       48
       48
        
             ''

     

       49
       49
        
             else if stdenv.system == "x86_64-linux" then

     

       50
       50
        
             ''

     

       51
       51
       -
               patchelf --set-interpreter ${stdenv.gcc.libc}/lib/ld-linux-x86-64.so.2 titanium_prep.linux64

     

       51
       51
       +
               patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux-x86-64.so.2 titanium_prep.linux64

     

       52
       52
        
             ''

     

       53
       53
        
             else ""}

     

       54
       54

+1 -1

pkgs/development/tools/atom-shell/default.nix

···

       32
       32
        
         installPhase = ''

     

       33
       33
        
           mkdir -p $out/bin

     

       34
       34
        
           unzip -d $out/bin $src

     

       35
       35
       -
           patchelf --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \

     

       35
       35
       +
           patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \

     

       36
       36
        
           $out/bin/atom

     

       37
       37
        
           mv $out/bin/atom $out/bin/atom-shell

     

       38
       38
        
           wrapProgram $out/bin/atom-shell \

+2 -2

pkgs/development/tools/build-managers/cargo/common.nix

···

       37
       37
        
             mkdir -p "$out"

     

       38
       38
        
             cp -r bin "$out/bin"

     

       39
       39
        
           '' + (if stdenv.isLinux then ''

     

       40
       40
       -
             patchelf --interpreter "${stdenv.glibc}/lib/${stdenv.gcc.dynamicLinker}" \

     

       41
       41
       -
                      --set-rpath "${stdenv.gcc.gcc}/lib/:${stdenv.gcc.gcc}/lib64/:${zlib}/lib" \

     

       40
       40
       +
             patchelf --interpreter "${stdenv.glibc}/lib/${stdenv.cc.dynamicLinker}" \

     

       41
       41
       +
                      --set-rpath "${stdenv.cc.gcc}/lib/:${stdenv.cc.gcc}/lib64/:${zlib}/lib" \

     

       42
       42
        
                      "$out/bin/cargo"

     

       43
       43
        
           '' else "");

     

       44
       44
        
         };

+1 -1

pkgs/development/tools/cdecl/default.nix

···

       11
       11
        
         preBuild = ''

     

       12
       12
        
           ${gnused}/bin/sed 's/getline/cdecl_getline/g' -i cdecl.c;

     

       13
       13
        
           makeFlagsArray=(CFLAGS="-DBSD -DUSE_READLINE -std=gnu89" LIBS=-lreadline);

     

       14
       14
       -
           makeFlags="$makeFlags PREFIX=$out BINDIR=$out/bin MANDIR=$out/man1 CATDIR=$out/cat1";

     

       14
       14
       +
           makeFlags="$makeFlags PREFIX=$out BINDIR=$out/bin MANDIR=$out/man1 CATDIR=$out/cat1 CC=$CC";

     

       15
       15
        
           mkdir -p $out/bin;

     

       16
       16
        
         '';

     

       17
       17
        
         buildInputs = [yacc flex readline ncurses];

+1 -1

pkgs/development/tools/misc/cflow/default.nix

···

       11
       11
        
         patchPhase = ''

     

       12
       12
        
           substituteInPlace "src/cflow.h"					\

     

       13
       13
        
             --replace "/usr/bin/cpp"						\

     

       14
       14
       -
                       "$(cat ${stdenv.gcc}/nix-support/orig-gcc)/bin/cpp"

     

       14
       14
       +
                       "$(cat ${stdenv.cc}/nix-support/orig-gcc)/bin/cpp"

     

       15
       15
        
         '';

     

       16
       16
        
       

     

       17
       17
        
         buildInputs = [ gettext ] ++

+2 -2

pkgs/development/tools/misc/saleae-logic/default.nix

···

       62
       62
        
           cp -r * "$out"

     

       63
       63
        
       

     

       64
       64
        
           # Patch it

     

       65
       65
       -
           patchelf --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" "$out/Logic"

     

       66
       66
       -
           patchelf --set-rpath "${stdenv.gcc.gcc}/lib:${stdenv.gcc.gcc}/lib64:${libPath}:\$ORIGIN/Analyzers:\$ORIGIN" "$out/Logic"

     

       65
       65
       +
           patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$out/Logic"

     

       66
       66
       +
           patchelf --set-rpath "${stdenv.cc.gcc}/lib:${stdenv.cc.gcc}/lib64:${libPath}:\$ORIGIN/Analyzers:\$ORIGIN" "$out/Logic"

     

       67
       67
        
       

     

       68
       68
        
           # Build the LD_PRELOAD library that makes Logic work from a read-only directory

     

       69
       69
        
           mkdir -p "$out/lib"

+3 -3

pkgs/development/tools/node-webkit/default.nix

···

       10
       10
        
           paths = [

     

       11
       11
        
             xlibs.libX11 xlibs.libXrender glib gtk atk pango cairo gdk_pixbuf

     

       12
       12
        
             freetype fontconfig xlibs.libXcomposite alsaLib xlibs.libXdamage

     

       13
       13
       -
             xlibs.libXext xlibs.libXfixes nss nspr gconf expat dbus stdenv.gcc.gcc

     

       13
       13
       +
             xlibs.libXext xlibs.libXfixes nss nspr gconf expat dbus stdenv.cc.gcc

     

       14
       14
        
             xlibs.libXtst xlibs.libXi

     

       15
       15
        
           ];

     

       16
       16
        
         };

     
···

       30
       30
        
           mkdir -p $out/share/node-webkit

     

       31
       31
        
           cp -R * $out/share/node-webkit

     

       32
       32
        
       

     

       33
       33
       -
           patchelf --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" $out/share/node-webkit/nw

     

       34
       34
       -
           patchelf --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" $out/share/node-webkit/nwsnapshot

     

       33
       33
       +
           patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/share/node-webkit/nw

     

       34
       34
       +
           patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/share/node-webkit/nwsnapshot

     

       35
       35
        
       

     

       36
       36
        
           ln -s ${udev}/lib/libudev.so $out/share/node-webkit/libudev.so.0

     

       37
       37

+2 -2

pkgs/development/tools/phantomjs/default.nix

···

       31
       31
        
       

     

       32
       32
        
         buildPhase = if stdenv.isDarwin then "" else ''

     

       33
       33
        
           patchelf \

     

       34
       34
       -
             --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \

     

       35
       35
       -
             --set-rpath "${freetype}/lib:${fontconfig}/lib:${stdenv.gcc.gcc}/lib64:${stdenv.gcc.gcc}/lib:${openssl}/lib" \

     

       34
       34
       +
             --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \

     

       35
       35
       +
             --set-rpath "${freetype}/lib:${fontconfig}/lib:${stdenv.cc.gcc}/lib64:${stdenv.cc.gcc}/lib:${openssl}/lib" \

     

       36
       36
        
             bin/phantomjs

     

       37
       37
        
         '';

     

       38
       38

+1 -1

pkgs/development/tools/selenium/chromedriver/default.nix

···

       23
       23
        
           mv chromedriver $out/bin

     

       24
       24
        
           patchelf --set-interpreter ${glibc}/lib/ld-linux-x86-64.so.2 $out/bin/chromedriver

     

       25
       25
        
           wrapProgram "$out/bin/chromedriver" \

     

       26
       26
       -
             --prefix LD_LIBRARY_PATH : "$(cat ${stdenv.gcc}/nix-support/orig-gcc)/lib64:${cairo}/lib:${fontconfig}/lib:${freetype}/lib:${gdk_pixbuf}/lib:${glib}/lib:${gtk}/lib:${libX11}/lib:${nspr}/lib:${nss}/lib:${pango}/lib:${libXrender}/lib:${gconf}/lib:${libXext}/lib:${libXi}/lib:\$LD_LIBRARY_PATH"

     

       26
       26
       +
             --prefix LD_LIBRARY_PATH : "$(cat ${stdenv.cc}/nix-support/orig-gcc)/lib64:${cairo}/lib:${fontconfig}/lib:${freetype}/lib:${gdk_pixbuf}/lib:${glib}/lib:${gtk}/lib:${libX11}/lib:${nspr}/lib:${nss}/lib:${pango}/lib:${libXrender}/lib:${gconf}/lib:${libXext}/lib:${libXi}/lib:\$LD_LIBRARY_PATH"

     

       27
       27
        
         '';

     

       28
       28
        
       

     

       29
       29
        
         meta = with stdenv.lib; {

+1 -1

pkgs/development/tools/selenium/server/default.nix

···

       28
       28
        
       

     

       29
       29
        
           ${jdk}/bin/jar xf $src launchers/launcher-linux-amd64

     

       30
       30
        
           patchelf \

     

       31
       31
       -
             --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \

     

       31
       31
       +
             --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \

     

       32
       32
        
             --set-rpath "${gcc.gcc}/lib/:${gcc.gcc}/lib64:${xlibs.libX11}/lib" \

     

       33
       33
        
             launchers/launcher-linux-${arch}

     

       34
       34
        
           ${jdk}/bin/jar uf $src launchers/launcher-linux-${arch}

+2 -2

pkgs/games/adom/default.nix

···

       7
       7
        
       

     

       8
       8
        
         inherit (xlibs) libXext libX11;

     

       9
       9
        
       

     

       10
       10
       -
         lpath = "${stdenv.gcc.gcc}/lib64:" + stdenv.lib.makeSearchPath "lib" [

     

       10
       10
       +
         lpath = "${stdenv.cc.gcc}/lib64:" + stdenv.lib.makeSearchPath "lib" [

     

       11
       11
        
             zlib libmad libpng12 libcaca libXext libX11 mesa alsaLib pulseaudio];

     

       12
       12
        
       

     

       13
       13
        
       in

     
···

       45
       45
        
           done

     

       46
       46
        
       

     

       47
       47
        
           ${patchelf}/bin/patchelf \

     

       48
       48
       -
             --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \

     

       48
       48
       +
             --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \

     

       49
       49
        
             --set-rpath "$out/lib:${lpath}" \

     

       50
       50
        
             $out/adom

     

       51
       51

+2 -2

pkgs/games/andyetitmoves/default.nix

···

       41
       41
        
           mkdir -p $out/{opt/andyetitmoves,bin}

     

       42
       42
        
           cp -r * $out/opt/andyetitmoves/

     

       43
       43
        
       

     

       44
       44
       -
           fullPath=${stdenv.gcc.gcc}/lib64

     

       44
       44
       +
           fullPath=${stdenv.cc.gcc}/lib64

     

       45
       45
        
           for i in $nativeBuildInputs; do

     

       46
       46
        
             fullPath=$fullPath''${fullPath:+:}$i/lib

     

       47
       47
        
           done

     

       48
       48
        
       

     

       49
       49
        
           binName=${if commercialVersion then "AndYetItMoves" else "AndYetItMovesDemo"}

     

       50
       50
        
       

     

       51
       51
       -
           patchelf --set-interpreter $(cat $NIX_GCC/nix-support/dynamic-linker) --set-rpath $fullPath $out/opt/andyetitmoves/lib/$binName

     

       51
       51
       +
           patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) --set-rpath $fullPath $out/opt/andyetitmoves/lib/$binName

     

       52
       52
        
           cat > $out/bin/$binName << EOF

     

       53
       53
        
           #!/bin/sh

     

       54
       54
        
           cd $out/opt/andyetitmoves

+2 -2

pkgs/games/banner/default.nix

···

       12
       12
        
             sha256 = hash;

     

       13
       13
        
           };

     

       14
       14
        
       

     

       15
       15
       -
           configurePhase = "make dep";

     

       15
       15
       +
           configurePhase = "make dep CC=$CC";

     

       16
       16
        
       

     

       17
       17
       -
           buildPhase = "make OPTIM='-DNDEBUG -O3'";

     

       17
       17
       +
           buildPhase = "make OPTIM='-DNDEBUG -O3' CC=$CC";

     

       18
       18
        
       

     

       19
       19
        
           installPhase = ''

     

       20
       20
        
             make INSTBASEDIR=$out install

+2 -2

pkgs/games/castle-combat/default.nix

···

       39
       39
        
         fixLoaderPath =

     

       40
       40
        
           let dollar = "\$"; in

     

       41
       41
        
           '' sed -i "$out/bin/castle-combat" \

     

       42
       42
       -
                  -e "/^exec/ iexport LD_LIBRARY_PATH=\"$(cat ${stdenv.gcc}/nix-support/orig-gcc)/lib\:"'${dollar}'"LD_LIBRARY_PATH\"\\

     

       43
       43
       -
       export LD_LIBRARY_PATH=\"$(cat ${stdenv.gcc}/nix-support/orig-gcc)/lib64\:"'${dollar}'"LD_LIBRARY_PATH\""

     

       42
       42
       +
                  -e "/^exec/ iexport LD_LIBRARY_PATH=\"$(cat ${stdenv.cc}/nix-support/orig-gcc)/lib\:"'${dollar}'"LD_LIBRARY_PATH\"\\

     

       43
       43
       +
       export LD_LIBRARY_PATH=\"$(cat ${stdenv.cc}/nix-support/orig-gcc)/lib64\:"'${dollar}'"LD_LIBRARY_PATH\""

     

       44
       44
        
           '';

     

       45
       45
        
             # ^

     

       46
       46
        
             # `--- The run-time says: "libgcc_s.so.1 must be installed for

+2 -2

pkgs/games/gemrb/default.nix

···

       1
       1
        
       { stdenv, fetchurl, cmake, SDL, openal, zlib, libpng, python, libvorbis }:

     

       2
       2
        
       

     

       3
       3
       -
       assert stdenv.gcc.libc != null;

     

       3
       3
       +
       assert stdenv.cc.libc != null;

     

       4
       4
        
       

     

       5
       5
        
       stdenv.mkDerivation rec {

     

       6
       6
        
         name = "gemrb-0.8.1";

     
···

       14
       14
        
         # TODO: make libpng, libvorbis, sdl_mixer, freetype, vlc, glew (and other gl reqs) optional

     

       15
       15
        
       

     

       16
       16
        
         # Necessary to find libdl.

     

       17
       17
       -
         CMAKE_LIBRARY_PATH = "${stdenv.gcc.libc}/lib";

     

       17
       17
       +
         CMAKE_LIBRARY_PATH = "${stdenv.cc.libc}/lib";

     

       18
       18
        
       

     

       19
       19
        
         # Can't have -werror because of the Vorbis header files.

     

       20
       20
        
         cmakeFlags = "-DDISABLE_WERROR=ON -DCMAKE_VERBOSE_MAKEFILE=ON";

+3 -3

pkgs/games/gsb/default.nix

···

       25
       25
        
         phases = "unpackPhase installPhase";

     

       26
       26
        
       

     

       27
       27
        
         # XXX: stdenv.lib.makeLibraryPath doesn't pick up /lib64

     

       28
       28
       -
         libPath = stdenv.lib.makeLibraryPath [ stdenv.gcc.gcc stdenv.gcc.libc ] 

     

       28
       28
       +
         libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.gcc stdenv.cc.libc ] 

     

       29
       29
        
           + ":" + stdenv.lib.makeLibraryPath [ SDL SDL_image libjpeg62 libpng12 mesa ]

     

       30
       30
        
           + ":" + stdenv.lib.makeLibraryPath [ curl3 openal libvorbis libogg ]

     

       31
       31
        
           + ":" + stdenv.lib.makeLibraryPath [ libX11 libXext libXft fontconfig zlib ]

     

       32
       32
       -
           + ":" + stdenv.gcc.gcc + "/lib64";

     

       32
       32
       +
           + ":" + stdenv.cc.gcc + "/lib64";

     

       33
       33
        
       

     

       34
       34
        
         installPhase = ''

     

       35
       35
        
           mkdir -p $out/libexec/positech/GSB/

     

       36
       36
        
           mkdir -p $out/bin

     

       37
       37
        
       

     

       38
       38
        
           patchelf \

     

       39
       39
       -
             --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \

     

       39
       39
       +
             --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \

     

       40
       40
        
             --set-rpath $libPath \

     

       41
       41
        
             ./GSB.bin.$arch

     

       42
       42

+11 -11

pkgs/games/oilrush/default.nix

···

       23
       23
        
           cd bin

     

       24
       24
        
           for f in launcher_$arch libQtCoreUnigine_$arch.so.4 OilRush_$arch

     

       25
       25
        
           do

     

       26
       26
       -
             patchelf --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" $f

     

       26
       26
       +
             patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $f

     

       27
       27
        
           done

     

       28
       28
       -
           patchelf --set-rpath ${stdenv.gcc.gcc}/lib64:${stdenv.gcc.gcc}/lib:${libX11}/lib:${libXext}/lib:${libXrender}/lib:${fontconfig}/lib:${freetype}/lib\

     

       28
       28
       +
           patchelf --set-rpath ${stdenv.cc.gcc}/lib64:${stdenv.cc.gcc}/lib:${libX11}/lib:${libXext}/lib:${libXrender}/lib:${fontconfig}/lib:${freetype}/lib\

     

       29
       29
        
                    launcher_$arch

     

       30
       30
       -
           patchelf --set-rpath ${stdenv.gcc.gcc}/lib64:${stdenv.gcc.gcc}/lib\

     

       30
       30
       +
           patchelf --set-rpath ${stdenv.cc.gcc}/lib64:${stdenv.cc.gcc}/lib\

     

       31
       31
        
                    libNetwork_$arch.so

     

       32
       32
       -
           patchelf --set-rpath ${stdenv.gcc.gcc}/lib64:${stdenv.gcc.gcc}/lib\

     

       32
       32
       +
           patchelf --set-rpath ${stdenv.cc.gcc}/lib64:${stdenv.cc.gcc}/lib\

     

       33
       33
        
                    libQtCoreUnigine_$arch.so.4

     

       34
       34
       -
           patchelf --set-rpath ${stdenv.gcc.gcc}/lib64:${stdenv.gcc.gcc}/lib:${libX11}/lib:${libXext}/lib:${libXrender}/lib:${fontconfig}/lib:${freetype}/lib\

     

       34
       34
       +
           patchelf --set-rpath ${stdenv.cc.gcc}/lib64:${stdenv.cc.gcc}/lib:${libX11}/lib:${libXext}/lib:${libXrender}/lib:${fontconfig}/lib:${freetype}/lib\

     

       35
       35
        
                    libQtGuiUnigine_$arch.so.4

     

       36
       36
       -
           patchelf --set-rpath ${stdenv.gcc.gcc}/lib64:${stdenv.gcc.gcc}/lib\

     

       36
       36
       +
           patchelf --set-rpath ${stdenv.cc.gcc}/lib64:${stdenv.cc.gcc}/lib\

     

       37
       37
        
                    libQtNetworkUnigine_$arch.so.4

     

       38
       38
       -
           patchelf --set-rpath ${stdenv.gcc.gcc}/lib64:${stdenv.gcc.gcc}/lib:${libX11}/lib:${libXext}/lib:${libXrender}/lib:${fontconfig}/lib:${freetype}/lib\

     

       38
       38
       +
           patchelf --set-rpath ${stdenv.cc.gcc}/lib64:${stdenv.cc.gcc}/lib:${libX11}/lib:${libXext}/lib:${libXrender}/lib:${fontconfig}/lib:${freetype}/lib\

     

       39
       39
        
                    libQtWebKitUnigine_$arch.so.4

     

       40
       40
       -
           patchelf --set-rpath ${stdenv.gcc.gcc}/lib64:${stdenv.gcc.gcc}/lib\

     

       40
       40
       +
           patchelf --set-rpath ${stdenv.cc.gcc}/lib64:${stdenv.cc.gcc}/lib\

     

       41
       41
        
                    libQtXmlUnigine_$arch.so.4

     

       42
       42
       -
           patchelf --set-rpath ${stdenv.gcc.gcc}/lib64:${stdenv.gcc.gcc}/lib\

     

       42
       42
       +
           patchelf --set-rpath ${stdenv.cc.gcc}/lib64:${stdenv.cc.gcc}/lib\

     

       43
       43
        
                    libRakNet_$arch.so

     

       44
       44
       -
           patchelf --set-rpath ${stdenv.gcc.gcc}/lib64:${stdenv.gcc.gcc}/lib:${libX11}/lib:${libXext}/lib:${libXinerama}/lib:${libXrandr}/lib\

     

       44
       44
       +
           patchelf --set-rpath ${stdenv.cc.gcc}/lib64:${stdenv.cc.gcc}/lib:${libX11}/lib:${libXext}/lib:${libXinerama}/lib:${libXrandr}/lib\

     

       45
       45
        
                    libUnigine_$arch.so

     

       46
       46
       -
           patchelf --set-rpath ${stdenv.gcc.gcc}/lib64:${stdenv.gcc.gcc}/lib:${libX11}/lib:${libXext}/lib:${libXinerama}/lib:${libXrandr}/lib\

     

       46
       46
       +
           patchelf --set-rpath ${stdenv.cc.gcc}/lib64:${stdenv.cc.gcc}/lib:${libX11}/lib:${libXext}/lib:${libXinerama}/lib:${libXrandr}/lib\

     

       47
       47
        
                    OilRush_$arch

     

       48
       48
        
         '';

     

       49
       49
        
         installPhase = ''

+4 -4

pkgs/games/planetaryannihilation/default.nix

···

       34
       34
        
       

     

       35
       35
        
           ln -s ${systemd}/lib/libudev.so.1 $out/lib/libudev.so.0

     

       36
       36
        
       

     

       37
       37
       -
           patchelf --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" "$out/PA"

     

       38
       38
       -
           patchelf --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.gcc.gcc xlibs.libXdamage xorg.libXfixes gtk glib stdenv.glibc "$out" xlibs.libXext pango udev xlibs.libX11 xlibs.libXcomposite alsaLib atk nspr fontconfig cairo pango nss freetype gnome3.gconf gdk_pixbuf xlibs.libXrender ]}:{stdenv.gcc.gcc}/lib64:${stdenv.glibc}/lib64" "$out/host/CoherentUI_Host.bin" 

     

       37
       37
       +
           patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$out/PA"

     

       38
       38
       +
           patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.cc.gcc xlibs.libXdamage xorg.libXfixes gtk glib stdenv.glibc "$out" xlibs.libXext pango udev xlibs.libX11 xlibs.libXcomposite alsaLib atk nspr fontconfig cairo pango nss freetype gnome3.gconf gdk_pixbuf xlibs.libXrender ]}:{stdenv.cc.gcc}/lib64:${stdenv.glibc}/lib64" "$out/host/CoherentUI_Host.bin" 

     

       39
       39
        
       

     

       40
       40
       -
           wrapProgram $out/PA --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ stdenv.gcc.gcc stdenv.glibc xlibs.libX11 xlibs.libXcursor gtk glib curl "$out" ]}:${stdenv.gcc.gcc}/lib64:${stdenv.glibc}/lib64"

     

       40
       40
       +
           wrapProgram $out/PA --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ stdenv.cc.gcc stdenv.glibc xlibs.libX11 xlibs.libXcursor gtk glib curl "$out" ]}:${stdenv.cc.gcc}/lib64:${stdenv.glibc}/lib64"

     

       41
       41
        
       

     

       42
       42
        
           for f in $out/lib/*; do

     

       43
       43
       -
             patchelf --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.gcc.gcc curl xlibs.libX11 stdenv.glibc xlibs.libXcursor "$out" ]}:${stdenv.gcc.gcc}/lib64:${stdenv.glibc}/lib64" $f

     

       43
       43
       +
             patchelf --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.cc.gcc curl xlibs.libX11 stdenv.glibc xlibs.libXcursor "$out" ]}:${stdenv.cc.gcc}/lib64:${stdenv.glibc}/lib64" $f

     

       44
       44
        
           done

     

       45
       45
        
         '';

     

       46
       46

+1 -1

pkgs/games/quake3/wrapper/default.nix

···

       7
       7
        
         

     

       8
       8
        
         inherit game paks mesa name;

     

       9
       9
        
       

     

       10
       10
       -
         gcc = stdenv.gcc.gcc;

     

       10
       10
       +
         gcc = stdenv.cc.gcc;

     

       11
       11
        
         

     

       12
       12
        
         meta = {

     

       13
       13
        
           inherit description;

+2 -2

pkgs/games/sdlmame/default.nix

···

       22
       22
        
       

     

       23
       23
        
         installPhase = ''

     

       24
       24
        
           patchelf \

     

       25
       25
       -
             --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \

     

       26
       26
       -
             --set-rpath "${alsaLib}/lib:${qt48}/lib:${SDL}/lib:${fontconfig}/lib:${freetype}/lib:${SDL_ttf}/lib:${xlibs.libX11}/lib:${xlibs.libXinerama}/lib:${stdenv.gcc.gcc}/lib" \

     

       25
       25
       +
             --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \

     

       26
       26
       +
             --set-rpath "${alsaLib}/lib:${qt48}/lib:${SDL}/lib:${fontconfig}/lib:${freetype}/lib:${SDL_ttf}/lib:${xlibs.libX11}/lib:${xlibs.libXinerama}/lib:${stdenv.cc.gcc}/lib" \

     

       27
       27
        
             share/sdlmame/sdlmame

     

       28
       28
        
       

     

       29
       29
        
           mkdir -p "$out/bin"

+1 -1

pkgs/games/spring/default.nix

···

       32
       32
        
       

     

       33
       33
        
         postInstall = ''

     

       34
       34
        
           wrapProgram "$out/bin/spring" \

     

       35
       35
       -
             --prefix LD_LIBRARY_PATH : "${stdenv.gcc.gcc}/lib::${systemd}/lib"

     

       35
       35
       +
             --prefix LD_LIBRARY_PATH : "${stdenv.cc.gcc}/lib::${systemd}/lib"

     

       36
       36
        
         '';

     

       37
       37
        
       

     

       38
       38
        
         meta = with stdenv.lib; {

+1 -1

pkgs/games/tibia/default.nix

···

       25
       25
        
           cp -r * $out/res

     

       26
       26
        
       

     

       27
       27
        
           patchelf --set-interpreter ${glibc}/lib/ld-linux.so.2 \

     

       28
       28
       -
                    --set-rpath ${stdenv.gcc.gcc}/lib:${libX11}/lib:${mesa}/lib \

     

       28
       28
       +
                    --set-rpath ${stdenv.cc.gcc}/lib:${libX11}/lib:${mesa}/lib \

     

       29
       29
        
                    "$out/res/Tibia"

     

       30
       30
        
       

     

       31
       31
        
           # We've patchelf'd the files. The main ‘Tibia’ binary is a bit

+2 -2

pkgs/games/tremulous/default.nix

···

       28
       28
        
         patches = [ ./parse.patch ];

     

       29
       29
        
         patchFlags = "-p 0";

     

       30
       30
        
         NIX_LD_FLAGS = ''

     

       31
       31
       -
           -rpath ${stdenv.gcc}/lib

     

       32
       32
       -
           -rpath ${stdenv.gcc}/lib64

     

       31
       31
       +
           -rpath ${stdenv.cc}/lib

     

       32
       32
       +
           -rpath ${stdenv.cc}/lib64

     

       33
       33
        
         '';

     

       34
       34
        
         buildPhase = ''

     

       35
       35
        
           cd Release_1.011

+1 -1

pkgs/games/ue4demos/default.nix

···

       12
       12
        
       

     

       13
       13
        
             rtdeps = stdenv.lib.makeLibraryPath

     

       14
       14
        
               [ xlibs.libXxf86vm xlibs.libXext openal ]

     

       15
       15
       -
               + ":" + stdenv.lib.makeSearchPath "lib64" [ stdenv.gcc.gcc ];

     

       15
       15
       +
               + ":" + stdenv.lib.makeSearchPath "lib64" [ stdenv.cc.gcc ];

     

       16
       16
        
       

     

       17
       17
        
             buildCommand =

     

       18
       18
        
             ''

+1 -1

pkgs/games/ultrastardx/default.nix

···

       15
       15
        
         # The fpc is not properly wrapped to add -rpath. I add this manually.

     

       16
       16
        
         # I even do a trick on lib/lib64 for libgcc, that I expect it will work.

     

       17
       17
        
         preBuild = ''

     

       18
       18
       -
           export NIX_LDFLAGS="$NIX_LDFLAGS -rpath ${SDL}/lib -rpath ${SDL_image}/lib -rpath ${libpng}/lib -rpath ${freetype}/lib -rpath ${portaudio}/lib -rpath ${ffmpeg}/lib -rpath ${zlib}/lib -rpath ${sqlite}/lib -rpath ${libX11}/lib -rpath ${pcre}/lib -rpath ${lua}/lib -rpath ${stdenv.gcc.gcc}/lib64 -rpath ${stdenv.gcc.gcc}/lib"

     

       18
       18
       +
           export NIX_LDFLAGS="$NIX_LDFLAGS -rpath ${SDL}/lib -rpath ${SDL_image}/lib -rpath ${libpng}/lib -rpath ${freetype}/lib -rpath ${portaudio}/lib -rpath ${ffmpeg}/lib -rpath ${zlib}/lib -rpath ${sqlite}/lib -rpath ${libX11}/lib -rpath ${pcre}/lib -rpath ${lua}/lib -rpath ${stdenv.cc.gcc}/lib64 -rpath ${stdenv.cc.gcc}/lib"

     

       19
       19
        
       

     

       20
       20
        
           sed -i 414,424d Makefile

     

       21
       21
        
         '';

+1 -1

pkgs/games/ut2004demo/builder.sh

···

       25
       25
        
       

     

       26
       26
        
       # Set the ELF interpreter to our own Glibc.

     

       27
       27
        
       for i in "$out/System/ucc-bin" "$out/System/ut2004-bin"; do

     

       28
       28
       -
           patchelf --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" "$i"

     

       28
       28
       +
           patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$i"

     

       29
       29
        
       done

+3 -3

pkgs/games/vessel/default.nix

···

       20
       20
        
         phases = "installPhase";

     

       21
       21
        
         ld_preload = ./isatty.c;

     

       22
       22
        
       

     

       23
       23
       -
         libPath = stdenv.lib.makeLibraryPath [ stdenv.gcc.gcc stdenv.gcc.libc ] 

     

       23
       23
       +
         libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.gcc stdenv.cc.libc ] 

     

       24
       24
        
           + ":" + stdenv.lib.makeLibraryPath [ SDL pulseaudio alsaLib ] ;

     

       25
       25
        
       

     

       26
       26
        
         installPhase = ''

     
···

       35
       35
        
           echo @@@ 

     

       36
       36
        
       

     

       37
       37
        
           # if we call ld.so $(bin) we don't need to set the ELF interpreter, and save a patchelf step. 

     

       38
       38
       -
           LD_PRELOAD=./isatty.so $(cat $NIX_GCC/nix-support/dynamic-linker) $src << IM_A_BOT

     

       38
       38
       +
           LD_PRELOAD=./isatty.so $(cat $NIX_CC/nix-support/dynamic-linker) $src << IM_A_BOT

     

       39
       39
        
           n

     

       40
       40
        
           $out/libexec/strangeloop/vessel/

     

       41
       41
        
           IM_A_BOT

     
···

       47
       47
        
           # props to Ethan Lee (the Vessel porter) for understanding

     

       48
       48
        
           # how $ORIGIN works in rpath. There is hope for humanity. 

     

       49
       49
        
           patchelf \

     

       50
       50
       -
             --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \

     

       50
       50
       +
             --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \

     

       51
       51
        
             --set-rpath $libPath:$out/libexec/strangeloop/vessel/x86/ \

     

       52
       52
        
             $out/libexec/strangeloop/vessel/x86/vessel.x86

     

       53
       53

+3 -3

pkgs/games/worldofgoo/default.nix

···

       45
       45
        
         phases = "unpackPhase installPhase";

     

       46
       46
        
       

     

       47
       47
        
         # XXX: stdenv.lib.makeLibraryPath doesn't pick up /lib64

     

       48
       48
       -
         libPath = stdenv.lib.makeLibraryPath [ stdenv.gcc.gcc stdenv.gcc.libc ] 

     

       48
       48
       +
         libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.gcc stdenv.cc.libc ] 

     

       49
       49
        
           + ":" + stdenv.lib.makeLibraryPath [libX11 libXext libXau libxcb libXdmcp SDL SDL_mixer libvorbis mesa ]

     

       50
       50
       -
           + ":" + stdenv.gcc.gcc + "/lib64";

     

       50
       50
       +
           + ":" + stdenv.cc.gcc + "/lib64";

     

       51
       51
        
       

     

       52
       52
        
         installPhase = ''

     

       53
       53
        
           mkdir -p $out/libexec/2dboy/WorldOfGoo/

     

       54
       54
        
           mkdir -p $out/bin

     

       55
       55
        
       

     

       56
       56
       -
           patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" --set-rpath $libPath ./WorldOfGoo.bin64

     

       56
       56
       +
           patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath $libPath ./WorldOfGoo.bin64

     

       57
       57
        
       

     

       58
       58
        
           cp -r * $out/libexec/2dboy/WorldOfGoo/

     

       59
       59

+1 -1

pkgs/misc/cups/drivers/samsung/builder.sh

···

       28
       28
        
       cd $out/lib/cups/filter

     

       29
       29
        
       for i in $(ls); do

     

       30
       30
        
           echo patching $i...

     

       31
       31
       -
           patchelf --set-interpreter $(cat $NIX_GCC/nix-support/dynamic-linker) $i || echo "(couldn't set interpreter)"

     

       31
       31
       +
           patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) $i || echo "(couldn't set interpreter)"

     

       32
       32
        
           patchelf --set-rpath $cups/lib:$gcc/lib:$glibc/lib $i  # This might not be necessary.

     

       33
       33
        
       done

     

       34
       34

+2 -2

pkgs/misc/drivers/gutenprint/bin.nix

···

       38
       38
        
       

     

       39
       39
        
         phases = "buildPhase";

     

       40
       40
        
       

     

       41
       41
       -
         libPath = stdenv.lib.makeLibraryPath [ stdenv.gcc.gcc zlib ];

     

       41
       41
       +
         libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.gcc zlib ];

     

       42
       42
        
       

     

       43
       43
        
         buildPhase = ''

     

       44
       44
        
           ar -x $src data.tar.gz

     
···

       53
       53
        
               $out/cups/lib/backend/{canon,epson} \

     

       54
       54
        
               $out/sbin/cups-genppd.5.0 \

     

       55
       55
        
             ; do

     

       56
       56
       -
             patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \

     

       56
       56
       +
             patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \

     

       57
       57
        
                 --set-rpath $libPath $p

     

       58
       58
        
           done

     

       59
       59

+3 -3

pkgs/misc/emulators/wine/stable.nix

···

       4
       4
        
       }:

     

       5
       5
        
       

     

       6
       6
        
       assert stdenv.isLinux;

     

       7
       7
       -
       assert stdenv.gcc.gcc != null;

     

       7
       7
       +
       assert stdenv.cc.gcc != null;

     

       8
       8
        
       

     

       9
       9
        
       let

     

       10
       10
        
           version = "1.6.2";

     
···

       46
       46
        
         # them to the RPATH so that the user doesn't have to set them in

     

       47
       47
        
         # LD_LIBRARY_PATH.

     

       48
       48
        
         NIX_LDFLAGS = map (path: "-rpath ${path}/lib ") [

     

       49
       49
       -
           freetype fontconfig stdenv.gcc.gcc mesa mesa_noglu.osmesa libdrm

     

       49
       49
       +
           freetype fontconfig stdenv.cc.gcc mesa mesa_noglu.osmesa libdrm

     

       50
       50
        
           xlibs.libXinerama xlibs.libXrender xlibs.libXrandr

     

       51
       51
        
           xlibs.libXcursor xlibs.libXcomposite libpng libjpeg

     

       52
       52
        
           openssl gnutls cups

     
···

       65
       65
        
       

     

       66
       66
        
           paxmark psmr $out/bin/wine{,-preloader}

     

       67
       67
        
       

     

       68
       68
       -
           wrapProgram $out/bin/wine --prefix LD_LIBRARY_PATH : ${stdenv.gcc.gcc}/lib

     

       68
       68
       +
           wrapProgram $out/bin/wine --prefix LD_LIBRARY_PATH : ${stdenv.cc.gcc}/lib

     

       69
       69
        
         '';

     

       70
       70
        
       

     

       71
       71
        
         enableParallelBuilding = true;

+3 -3

pkgs/misc/emulators/wine/unstable.nix

···

       4
       4
        
       }:

     

       5
       5
        
       

     

       6
       6
        
       assert stdenv.isLinux;

     

       7
       7
       -
       assert stdenv.gcc.gcc != null;

     

       7
       7
       +
       assert stdenv.cc.gcc != null;

     

       8
       8
        
       

     

       9
       9
        
       let

     

       10
       10
        
           version = "1.7.33";

     
···

       46
       46
        
         # them to the RPATH so that the user doesn't have to set them in

     

       47
       47
        
         # LD_LIBRARY_PATH.

     

       48
       48
        
         NIX_LDFLAGS = map (path: "-rpath ${path}/lib ") [

     

       49
       49
       -
           freetype fontconfig stdenv.gcc.gcc mesa mesa_noglu.osmesa libdrm

     

       49
       49
       +
           freetype fontconfig stdenv.cc.gcc mesa mesa_noglu.osmesa libdrm

     

       50
       50
        
           xlibs.libXinerama xlibs.libXrender xlibs.libXrandr

     

       51
       51
        
           xlibs.libXcursor xlibs.libXcomposite libpng libjpeg

     

       52
       52
        
           openssl gnutls cups ncurses

     
···

       62
       62
        
           install -D ${gecko} $out/share/wine/gecko/${gecko64.name}

     

       63
       63
        
         '' + ''

     

       64
       64
        
           install -D ${mono} $out/share/wine/mono/${mono.name}

     

       65
       65
       -
           wrapProgram $out/bin/wine --prefix LD_LIBRARY_PATH : ${stdenv.gcc.gcc}/lib

     

       65
       65
       +
           wrapProgram $out/bin/wine --prefix LD_LIBRARY_PATH : ${stdenv.cc.gcc}/lib

     

       66
       66
        
         '';

     

       67
       67
        
       

     

       68
       68
        
         enableParallelBuilding = true;

+1 -1

pkgs/misc/foldingathome/default.nix

···

       23
       23
        
         installPhase = ''

     

       24
       24
        
           BINFILES="fah6 mpiexec";

     

       25
       25
        
           for a in $BINFILES; do 

     

       26
       26
       -
             patchelf --set-interpreter $(cat $NIX_GCC/nix-support/dynamic-linker) $a

     

       26
       26
       +
             patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) $a

     

       27
       27
        
           done

     

       28
       28
        
           mkdir -p $out/bin

     

       29
       29
        
           cp $BINFILES $out/bin

+1 -1

pkgs/misc/my-env/default.nix

···

       58
       58
        
       

     

       59
       59
        
       { mkDerivation, substituteAll, pkgs }:

     

       60
       60
        
           { stdenv ? pkgs.stdenv, name, buildInputs ? []

     

       61
       61
       -
           , propagatedBuildInputs ? [], gcc ? stdenv.gcc, cTags ? [], extraCmds ? ""

     

       61
       61
       +
           , propagatedBuildInputs ? [], gcc ? stdenv.cc, cTags ? [], extraCmds ? ""

     

       62
       62
        
           , cleanupCmds ? "", shell ? "${pkgs.bashInteractive}/bin/bash --norc"}:

     

       63
       63
        
       

     

       64
       64
        
       mkDerivation {

+1 -1

pkgs/os-specific/linux/ati-drivers/default.nix

···

       36
       36
        
         builder = ./builder.sh;

     

       37
       37
        
       

     

       38
       38
        
         inherit libXxf86vm xf86vidmodeproto;

     

       39
       39
       -
         gcc = stdenv.gcc.gcc;

     

       39
       39
       +
         gcc = stdenv.cc.gcc;

     

       40
       40
        
       

     

       41
       41
        
         src = fetchurl {

     

       42
       42
        
           url = http://www2.ati.com/drivers/linux/amd-catalyst-omega-14.12-linux-run-installers.zip;

+1 -1

pkgs/os-specific/linux/cpufrequtils/default.nix

···

       21
       21
        
             -i Makefile

     

       22
       22
        
         '';

     

       23
       23
        
       

     

       24
       24
       -
         buildInputs = [ stdenv.gcc.libc.kernelHeaders libtool gettext ];

     

       24
       24
       +
         buildInputs = [ stdenv.cc.libc.kernelHeaders libtool gettext ];

     

       25
       25
        
       

     

       26
       26
        
         meta = {

     

       27
       27
        
           description = "Tools to display or change the CPU governor settings";

+1 -1

pkgs/os-specific/linux/nvidia-x11/builder-legacy173.sh

···

       81
       81
        
       

     

       82
       82
        
               for i in nvidia-settings nvidia-xconfig; do

     

       83
       83
        
       	    cp usr/bin/$i $out/bin/$i

     

       84
       84
       -
       	    patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \

     

       84
       84
       +
       	    patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \

     

       85
       85
        
       	        --set-rpath $out/lib:$programPath:$glPath $out/bin/$i

     

       86
       86
        
               done

     

       87
       87

+1 -1

pkgs/os-specific/linux/nvidia-x11/builder-legacy304.sh

···

       72
       72
        
       

     

       73
       73
        
               for i in nvidia-settings nvidia-xconfig; do

     

       74
       74
        
       	    cp $i $out/bin/$i

     

       75
       75
       -
       	    patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \

     

       75
       75
       +
       	    patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \

     

       76
       76
        
       	        --set-rpath $out/lib:$programPath:$glPath $out/bin/$i

     

       77
       77
        
               done

     

       78
       78

+1 -1

pkgs/os-specific/linux/nvidia-x11/builder-legacy340.sh

···

       51
       51
        
       

     

       52
       52
        
               for i in nvidia-settings nvidia-smi; do

     

       53
       53
        
                   cp $i $out/bin/$i

     

       54
       54
       -
                   patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \

     

       54
       54
       +
                   patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \

     

       55
       55
        
                       --set-rpath $out/lib:$programPath:$glPath $out/bin/$i

     

       56
       56
        
               done

     

       57
       57

+1 -1

pkgs/os-specific/linux/nvidia-x11/legacy173.nix

···

       32
       32
        
       

     

       33
       33
        
         glPath = stdenv.lib.makeLibraryPath [xlibs.libXext xlibs.libX11 xlibs.libXrandr];

     

       34
       34
        
       

     

       35
       35
       -
         cudaPath = stdenv.lib.makeLibraryPath [zlib stdenv.gcc.gcc];

     

       35
       35
       +
         cudaPath = stdenv.lib.makeLibraryPath [zlib stdenv.cc.gcc];

     

       36
       36
        
       

     

       37
       37
        
         programPath = stdenv.lib.makeLibraryPath [ gtk atk pango glib gdk_pixbuf xlibs.libXv ];

     

       38
       38

+1 -1

pkgs/os-specific/linux/nvidia-x11/legacy304.nix

···

       36
       36
        
       

     

       37
       37
        
         glPath = stdenv.lib.makeLibraryPath [xlibs.libXext xlibs.libX11 xlibs.libXrandr];

     

       38
       38
        
       

     

       39
       39
       -
         cudaPath = stdenv.lib.makeLibraryPath [zlib stdenv.gcc.gcc];

     

       39
       39
       +
         cudaPath = stdenv.lib.makeLibraryPath [zlib stdenv.cc.gcc];

     

       40
       40
        
       

     

       41
       41
        
         programPath = optionalString (!libsOnly) (stdenv.lib.makeLibraryPath

     

       42
       42
        
           [ gtk atk pango glib gdk_pixbuf xlibs.libXv ] );

+2 -2

pkgs/os-specific/linux/nvidia-x11/legacy340.nix

···

       45
       45
        
         dontStrip = true;

     

       46
       46
        
       

     

       47
       47
        
         glPath      = makeLibraryPath [xlibs.libXext xlibs.libX11 xlibs.libXrandr];

     

       48
       48
       -
         cudaPath    = makeLibraryPath [zlib stdenv.gcc.gcc];

     

       48
       48
       +
         cudaPath    = makeLibraryPath [zlib stdenv.cc.gcc];

     

       49
       49
        
         openclPath  = makeLibraryPath [zlib];

     

       50
       50
       -
         allLibPath  = makeLibraryPath [xlibs.libXext xlibs.libX11 xlibs.libXrandr zlib stdenv.gcc.gcc];

     

       50
       50
       +
         allLibPath  = makeLibraryPath [xlibs.libXext xlibs.libX11 xlibs.libXrandr zlib stdenv.cc.gcc];

     

       51
       51
        
       

     

       52
       52
        
         programPath = optionalString (!libsOnly) (makeLibraryPath

     

       53
       53
        
           [ gtk atk pango glib gdk_pixbuf xlibs.libXv ] );

+1 -1

pkgs/os-specific/linux/opengl/xorg-sys/default.nix

···

       11
       11
        
       stdenv.mkDerivation {

     

       12
       12
        
         name = "xorg-sys-opengl-3";

     

       13
       13
        
         builder = ./builder.sh;

     

       14
       14
       -
         neededLibs = [xlibs.libXxf86vm xlibs.libXext expat libdrm stdenv.gcc.gcc];

     

       14
       14
       +
         neededLibs = [xlibs.libXxf86vm xlibs.libXext expat libdrm stdenv.cc.gcc];

     

       15
       15
        
       }

     

       16
       16

+1 -1

pkgs/os-specific/linux/prl-tools/default.nix

···

       120
       120
        
       

     

       121
       121
        
               for i in $out/bin/* $out/sbin/*; do

     

       122
       122
        
                 patchelf \

     

       123
       123
       -
                   --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \

     

       123
       123
       +
                   --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \

     

       124
       124
        
                   --set-rpath "$out/lib:$libPath" \

     

       125
       125
        
                   $i

     

       126
       126
        
               done

+1 -1

pkgs/os-specific/linux/systemd/default.nix

···

       86
       86
        
       

     

       87
       87
        
         # This is needed because systemd uses the gold linker, which doesn't

     

       88
       88
        
         # yet have the wrapper script to add rpath flags automatically.

     

       89
       89
       -
         NIX_LDFLAGS = "-rpath ${pam}/lib -rpath ${libcap}/lib -rpath ${acl}/lib -rpath ${stdenv.gcc.gcc}/lib";

     

       89
       89
       +
         NIX_LDFLAGS = "-rpath ${pam}/lib -rpath ${libcap}/lib -rpath ${acl}/lib -rpath ${stdenv.cc.gcc}/lib";

     

       90
       90
        
       

     

       91
       91
        
         PYTHON_BINARY = "${coreutils}/bin/env python"; # don't want a build time dependency on Python

     

       92
       92

+1 -1

pkgs/servers/http/openresty/default.nix

···

       51
       51
        
       

     

       52
       52
        
         preConfigure = ''

     

       53
       53
        
           export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${libxml2}/include/libxml2 $additionalFlags"

     

       54
       54
       -
           export PATH="$PATH:${stdenv.gcc.libc}/sbin"

     

       54
       54
       +
           export PATH="$PATH:${stdenv.cc.libc}/sbin"

     

       55
       55
        
           patchShebangs .

     

       56
       56
        
         '';

     

       57
       57

+2 -2

pkgs/servers/monitoring/zabbix/2.0.nix

···

       17
       17
        
           ''

     

       18
       18
        
             substituteInPlace ./configure \

     

       19
       19
        
               --replace " -static" "" \

     

       20
       20
       -
               ${stdenv.lib.optionalString (stdenv.gcc.libc != null) ''

     

       21
       21
       -
                 --replace /usr/include/iconv.h ${stdenv.gcc.libc}/include/iconv.h

     

       20
       20
       +
               ${stdenv.lib.optionalString (stdenv.cc.libc != null) ''

     

       21
       21
       +
                 --replace /usr/include/iconv.h ${stdenv.cc.libc}/include/iconv.h

     

       22
       22
        
               ''}

     

       23
       23
        
           '';

     

       24
       24

+2 -2

pkgs/servers/monitoring/zabbix/2.2.nix

···

       22
       22
        
           ''

     

       23
       23
        
             substituteInPlace ./configure \

     

       24
       24
        
               --replace " -static" "" \

     

       25
       25
       -
               ${stdenv.lib.optionalString (stdenv.gcc.libc != null) ''

     

       26
       26
       -
                 --replace /usr/include/iconv.h ${stdenv.gcc.libc}/include/iconv.h

     

       25
       25
       +
               ${stdenv.lib.optionalString (stdenv.cc.libc != null) ''

     

       26
       26
       +
                 --replace /usr/include/iconv.h ${stdenv.cc.libc}/include/iconv.h

     

       27
       27
        
               ''}

     

       28
       28
        
           '';

     

       29
       29

+2 -2

pkgs/servers/monitoring/zabbix/default.nix

···

       13
       13
        
           ''

     

       14
       14
        
             substituteInPlace ./configure \

     

       15
       15
        
               --replace " -static" "" \

     

       16
       16
       -
               ${stdenv.lib.optionalString (stdenv.gcc.libc != null) ''

     

       17
       17
       -
                 --replace /usr/include/iconv.h ${stdenv.gcc.libc}/include/iconv.h

     

       16
       16
       +
               ${stdenv.lib.optionalString (stdenv.cc.libc != null) ''

     

       17
       17
       +
                 --replace /usr/include/iconv.h ${stdenv.cc.libc}/include/iconv.h

     

       18
       18
        
               ''}

     

       19
       19
        
           '';

     

       20
       20

+2 -2

pkgs/servers/nosql/influxdb/default.nix

···

       18
       18
        
       

     

       19
       19
        
         installPhase = ''

     

       20
       20
        
           install -D influxdb $out/bin/influxdb

     

       21
       21
       -
           patchelf --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" $out/bin/influxdb

     

       21
       21
       +
           patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/bin/influxdb

     

       22
       22
        
           wrapProgram "$out/bin/influxdb" \

     

       23
       23
       -
               --prefix LD_LIBRARY_PATH : "${stdenv.gcc.gcc}/lib:${stdenv.gcc.gcc}/lib64:${zlib}/lib:${bzip2}/lib"

     

       23
       23
       +
               --prefix LD_LIBRARY_PATH : "${stdenv.cc.gcc}/lib:${stdenv.cc.gcc}/lib64:${zlib}/lib:${bzip2}/lib"

     

       24
       24
        
       

     

       25
       25
        
           mkdir -p $out/share/influxdb

     

       26
       26
        
           cp -R admin scripts config.toml $out/share/influxdb

+2 -2

pkgs/servers/restund/default.nix

···

       15
       15
        
           ''PREFIX=$(out)''

     

       16
       16
        
           "USE_MYSQL=1"

     

       17
       17
        
         ]

     

       18
       18
       -
         ++ stdenv.lib.optional (stdenv.gcc.gcc != null) "SYSROOT_ALT=${stdenv.gcc.gcc}"

     

       19
       19
       -
         ++ stdenv.lib.optional (stdenv.gcc.libc != null) "SYSROOT=${stdenv.gcc.libc}"

     

       18
       18
       +
         ++ stdenv.lib.optional (stdenv.cc.gcc != null) "SYSROOT_ALT=${stdenv.cc.gcc}"

     

       19
       19
       +
         ++ stdenv.lib.optional (stdenv.cc.libc != null) "SYSROOT=${stdenv.cc.libc}"

     

       20
       20
        
         ;

     

       21
       21
        
         NIX_LDFLAGS='' -L${mysql}/lib/mysql '';

     

       22
       22
        
         meta = {

+1 -1

pkgs/servers/samba/default.nix

···

       52
       52
        
                "--localstatedir=/var"

     

       53
       53
        
              ]

     

       54
       54
        
           ++ (stdenv.lib.optional winbind "--with-winbind")

     

       55
       55
       -
           ++ (stdenv.lib.optional (stdenv.gcc.libc != null) "--with-libiconv=${stdenv.gcc.libc}");

     

       55
       55
       +
           ++ (stdenv.lib.optional (stdenv.cc.libc != null) "--with-libiconv=${stdenv.cc.libc}");

     

       56
       56
        
       

     

       57
       57
        
         # Need to use a DESTDIR because `make install' tries to write in /var and /etc.

     

       58
       58
        
         installFlags = "DESTDIR=$(TMPDIR)/inst";

+1 -1

pkgs/servers/sql/oracle-xe/default.nix

···

       54
       54
        
             \( -name '*.sh' \

     

       55
       55
        
             -o -path "$basedir/bin/*" \

     

       56
       56
        
             \) -print -exec "${patchelf}/bin/patchelf" \

     

       57
       57
       -
                  --interpreter "$(cat "$NIX_GCC/nix-support/dynamic-linker")" \

     

       57
       57
       +
                  --interpreter "$(cat "$NIX_CC/nix-support/dynamic-linker")" \

     

       58
       58
        
                  --set-rpath "${libs}:$out/libexec/oracle/lib" \

     

       59
       59
        
                  --force-rpath '{}' \;

     

       60
       60
        
         '';

+1 -1

pkgs/servers/sql/virtuoso/6.x.nix

···

       10
       10
        
       

     

       11
       11
        
         buildInputs = [ libxml2 openssl readline gawk ];

     

       12
       12
        
       

     

       13
       13
       -
         CPP = "${stdenv.gcc}/bin/gcc -E";

     

       13
       13
       +
         CPP = "${stdenv.cc}/bin/gcc -E";

     

       14
       14
        
       

     

       15
       15
        
         configureFlags = "

     

       16
       16
        
           --enable-shared --disable-all-vads --with-readline=${readline}

+1 -1

pkgs/servers/sql/virtuoso/7.x.nix

···

       10
       10
        
       

     

       11
       11
        
         buildInputs = [ libxml2 openssl readline gawk ];

     

       12
       12
        
       

     

       13
       13
       -
         CPP = "${stdenv.gcc}/bin/gcc -E";

     

       13
       13
       +
         CPP = "${stdenv.cc}/bin/gcc -E";

     

       14
       14
        
       

     

       15
       15
        
         configureFlags = "

     

       16
       16
        
           --enable-shared --disable-all-vads --with-readline=${readline}

+1 -6

pkgs/stdenv/adapters.nix

···

       8
       8
        
       

     

       9
       9
        
       

     

       10
       10
        
         # Override the compiler in stdenv for specific packages.

     

       11
       11
       -
         overrideGCC = stdenv: gcc: stdenv.override { allowedRequisites = null; inherit gcc; };

     

       11
       11
       +
         overrideGCC = stdenv: gcc: stdenv.override { allowedRequisites = null; cc = gcc; };

     

       12
       12
        
       

     

       13
       13
        
       

     

       14
       14
        
         # Add some arbitrary packages to buildInputs for specific packages.

     
···

       235
       235
        
             });

     

       236
       236
        
           };

     

       237
       237
        
       

     

       238
       238
       -
         dropCxx = drv: drv.override {

     

       239
       239
       -
           stdenv = if pkgs.stdenv.isDarwin

     

       240
       240
       -
             then pkgs.allStdenvs.stdenvDarwinNaked

     

       241
       241
       -
             else pkgs.stdenv;

     

       242
       242
       -
         };

     

       243
       238
        
       }

+3 -3

pkgs/stdenv/generic/default.nix

···

       1
       1
        
       let lib = import ../../../lib; in lib.makeOverridable (

     

       2
       2
        
       

     

       3
       3
       -
       { system, name ? "stdenv", preHook ? "", initialPath, gcc, shell

     

       3
       3
       +
       { system, name ? "stdenv", preHook ? "", initialPath, cc, shell

     

       4
       4
        
       , allowedRequisites ? null, extraAttrs ? {}, overrides ? (pkgs: {}), config

     

       5
       5
        
       

     

       6
       6
        
       , # The `fetchurl' to use for downloading curl and its dependencies

     
···

       48
       48
        
             ../../build-support/setup-hooks/patch-shebangs.sh

     

       49
       49
        
             ../../build-support/setup-hooks/move-sbin.sh

     

       50
       50
        
             ../../build-support/setup-hooks/move-lib64.sh

     

       51
       51
       -
             gcc

     

       51
       51
       +
             cc

     

       52
       52
        
           ];

     

       53
       53
        
       

     

       54
       54
        
         # Add a utility function to produce derivations that use this

     
···

       198
       198
        
       

     

       199
       199
        
             inherit overrides;

     

       200
       200
        
       

     

       201
       201
       -
             inherit gcc;

     

       201
       201
       +
             inherit cc;

     

       202
       202
        
           }

     

       203
       203
        
       

     

       204
       204
        
           # Propagate any extra attributes.  For instance, we use this to

+7 -7

pkgs/stdenv/linux/default.nix

···

       83
       83
        
                 curl = bootstrapTools;

     

       84
       84
        
               };

     

       85
       85
        
       

     

       86
       86
       -
               gcc = if isNull gccPlain

     

       87
       87
       -
                     then "/no-such-path"

     

       88
       88
       -
                     else lib.makeOverridable (import ../../build-support/gcc-wrapper) {

     

       86
       86
       +
               cc = if isNull gccPlain

     

       87
       87
       +
                    then "/no-such-path"

     

       88
       88
       +
                    else lib.makeOverridable (import ../../build-support/gcc-wrapper) {

     

       89
       89
        
                 nativeTools = false;

     

       90
       90
        
                 nativeLibc = false;

     

       91
       91
        
                 gcc = gccPlain;

     
···

       232
       232
        
             gcc = lib.makeOverridable (import ../../build-support/gcc-wrapper) {

     

       233
       233
        
               nativeTools = false;

     

       234
       234
        
               nativeLibc = false;

     

       235
       235
       -
               gcc = stage4.stdenv.gcc.gcc;

     

       235
       235
       +
               gcc = stage4.stdenv.cc.gcc;

     

       236
       236
        
               libc = stage4.pkgs.glibc;

     

       237
       237
        
               inherit (stage4.pkgs) binutils coreutils;

     

       238
       238
        
               name = "";

     
···

       267
       267
        
       

     

       268
       268
        
           extraBuildInputs = [ stage4.pkgs.patchelf stage4.pkgs.paxctl ];

     

       269
       269
        
       

     

       270
       270
       -
           gcc = stage4.pkgs.gcc;

     

       270
       270
       +
           cc = stage4.pkgs.gcc;

     

       271
       271
        
       

     

       272
       272
       -
           shell = gcc.shell;

     

       272
       272
       +
           shell = cc.shell;

     

       273
       273
        
       

     

       274
       274
        
           inherit (stage4.stdenv) fetchurlBoot;

     

       275
       275
        
       

     
···

       286
       286
        
             ];

     

       287
       287
        
       

     

       288
       288
        
           overrides = pkgs: {

     

       289
       289
       -
             inherit gcc;

     

       289
       289
       +
             inherit cc;

     

       290
       290
        
             inherit (stage4.pkgs)

     

       291
       291
        
               gzip bzip2 xz bash binutils coreutils diffutils findutils gawk

     

       292
       292
        
               glibc gnumake gnused gnutar gnugrep gnupatch patchelf

+1 -1

pkgs/tools/admin/tightvnc/default.nix

···

       10
       10
        
       

     

       11
       11
        
         # for the builder script

     

       12
       12
        
         inherit xauth fontDirectories perl;

     

       13
       13
       -
         gcc = stdenv.gcc.gcc;

     

       13
       13
       +
         gcc = stdenv.cc.gcc;

     

       14
       14
        
       

     

       15
       15
        
         buildInputs = [x11 zlib libjpeg imake gccmakedep libXmu libXaw libXpm libXp xauth];

     

       16
       16
        
         builder = ./builder.sh;

+1 -1

pkgs/tools/archivers/sharutils/default.nix

···

       12
       12
        
           ''

     

       13
       13
        
              # Fix for building on Glibc 2.16.  Won't be needed once the

     

       14
       14
        
              # gnulib in sharutils is updated.

     

       15
       15
       -
              sed -i ${stdenv.lib.optionalString (stdenv.isBSD && stdenv.gcc.nativeTools) "''"} '/gets is a security hole/d' lib/stdio.in.h

     

       15
       15
       +
              sed -i ${stdenv.lib.optionalString (stdenv.isBSD && stdenv.cc.nativeTools) "''"} '/gets is a security hole/d' lib/stdio.in.h

     

       16
       16
        
           '';

     

       17
       17
        
       

     

       18
       18
        
         # GNU Gettext is needed on non-GNU platforms.

+4

pkgs/tools/archivers/unrar/default.nix

···

       11
       11
        
           sha256 = "13ida8vcamiagl40d9yfjma9k6givxczhx278f1p7bv9wgb8gfmc";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       +
         preBuild = ''

     

       15
       15
       +
           export buildFlags="CXX=$CXX"

     

       16
       16
       +
         '';

     

       17
       17
       +
       

     

       14
       18
        
         installPhase = ''

     

       15
       19
        
           installBin unrar

     

       16
       20

+3 -3

pkgs/tools/filesystems/yandex-disk/default.nix

···

       5
       5
        
       let

     

       6
       6
        
         p = if stdenv.is64bit then {

     

       7
       7
        
             arch = "x86_64";

     

       8
       8
       -
             gcclib = "${stdenv.gcc.gcc}/lib64";

     

       8
       8
       +
             gcclib = "${stdenv.cc.gcc}/lib64";

     

       9
       9
        
             sha256 = "09kw7f0qsvx3vx1c1zb117yf3yk7kkz66agspz5xx9b0zh6i82jw";

     

       10
       10
        
           }

     

       11
       11
        
           else {

     

       12
       12
        
             arch = "i386";

     

       13
       13
       -
             gcclib = "${stdenv.gcc.gcc}/lib";

     

       13
       13
       +
             gcclib = "${stdenv.cc.gcc}/lib";

     

       14
       14
        
             sha256 = "0f2230c91120f05159281b39c620ab6bad6559ce8a17a0874d0a82350ebba426";

     

       15
       15
        
           };

     

       16
       16
        
       in 

     
···

       41
       41
        
             $out/etc/bash_completion.d/yandex-disk-completion.bash

     

       42
       42
        
       

     

       43
       43
        
           ${patchelf}/bin/patchelf \

     

       44
       44
       -
             --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \

     

       44
       44
       +
             --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \

     

       45
       45
        
             --set-rpath "${zlib}/lib:${p.gcclib}" \

     

       46
       46
        
             $out/bin/yandex-disk

     

       47
       47
        
         '';

+1 -1

pkgs/tools/graphics/cuneiform/default.nix

···

       31
       31
        
         needLib64 = a.stdenv.system == "x86_64-linux";

     

       32
       32
        
       

     

       33
       33
        
         postInstall = a.fullDepEntry(''

     

       34
       34
       -
           patchelf --set-rpath $out/lib${if needLib64 then "64" else ""}${if a.stdenv.gcc.gcc != null then ":${a.stdenv.gcc.gcc}/lib" else ""}${if a.stdenv.gcc.gcc != null && needLib64 then ":${a.stdenv.gcc.gcc}/lib64" else ""}:${a.imagemagick}/lib $out/bin/cuneiform

     

       34
       34
       +
           patchelf --set-rpath $out/lib${if needLib64 then "64" else ""}${if a.stdenv.cc.gcc != null then ":${a.stdenv.cc.gcc}/lib" else ""}${if a.stdenv.cc.gcc != null && needLib64 then ":${a.stdenv.cc.gcc}/lib64" else ""}:${a.imagemagick}/lib $out/bin/cuneiform

     

       35
       35
        
         '') ["minInit" "addInputs" "doMakeInstall"];

     

       36
       36
        
       

     

       37
       37
        
         name = "cuneiform-" + version;

+2 -2

pkgs/tools/misc/coreutils/default.nix

···

       27
       27
        
             buildInputs = [ gmp ]

     

       28
       28
        
               ++ optional aclSupport acl.crossDrv

     

       29
       29
        
               ++ optionals selinuxSupport [ libselinux.crossDrv libsepol.crossDrv ]

     

       30
       30
       -
               ++ optional (stdenv.gccCross.libc ? libiconv)

     

       31
       31
       -
                 stdenv.gccCross.libc.libiconv.crossDrv;

     

       30
       30
       +
               ++ optional (stdenv.ccCross.libc ? libiconv)

     

       31
       31
       +
                 stdenv.ccCross.libc.libiconv.crossDrv;

     

       32
       32
        
       

     

       33
       33
        
             buildPhase = ''

     

       34
       34
        
               make || (

+1 -1

pkgs/tools/misc/figlet/default.nix

···

       13
       13
        
       

     

       14
       14
        
         preConfigure = ''

     

       15
       15
        
           mkdir -p $out/{man/man6,bin}

     

       16
       16
       -
           makeFlags="DESTDIR=$out/bin MANDIR=$out/man/man6 DEFAULTFONTDIR=$out/share/figlet"

     

       16
       16
       +
           makeFlags="DESTDIR=$out/bin MANDIR=$out/man/man6 DEFAULTFONTDIR=$out/share/figlet CC=cc LD=cc"

     

       17
       17
        
         '';

     

       18
       18
        
       

     

       19
       19
        
         meta = {

+2 -2

pkgs/tools/misc/megacli/default.nix

···

       15
       15
        
         buildInputs = [rpmextract ncurses unzip makeWrapper];

     

       16
       16
        
         libPath =

     

       17
       17
        
           stdenv.lib.makeLibraryPath

     

       18
       18
       -
              [ stdenv.gcc.gcc stdenv.gcc.libc ncurses ];

     

       18
       18
       +
              [ stdenv.cc.gcc stdenv.cc.libc ncurses ];

     

       19
       19
        
       

     

       20
       20
        
         buildCommand = ''

     

       21
       21
        
           mkdir -p $out/bin

     

       22
       22
        
           cd $out

     

       23
       23
        
           unzip ${src}

     

       24
       24
        
           rpmextract linux/MegaCli-8.07.07-1.noarch.rpm

     

       25
       25
       -
           ${patchelf}/bin/patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" --set-rpath ${libPath}:$out/opt/lsi/3rdpartylibs/x86_64:$out/opt/lsi/3rdpartylibs:${stdenv.gcc.gcc}/lib64:${stdenv.gcc.gcc}/lib opt/MegaRAID/MegaCli/MegaCli64

     

       25
       25
       +
           ${patchelf}/bin/patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath ${libPath}:$out/opt/lsi/3rdpartylibs/x86_64:$out/opt/lsi/3rdpartylibs:${stdenv.cc.gcc}/lib64:${stdenv.cc.gcc}/lib opt/MegaRAID/MegaCli/MegaCli64

     

       26
       26
        
           wrapProgram $out/opt/MegaRAID/MegaCli/MegaCli64 --set LD_LIBRARY_PATH $out/opt/lsi/3rdpartylibs/x86_64

     

       27
       27
        
           ln -s $out/opt/MegaRAID/MegaCli/MegaCli64 $out/bin/MegaCli64

     

       28
       28
        
           eval fixupPhase

+2 -2

pkgs/tools/networking/atftp/default.nix

···

       1
       1
        
       { lib, stdenv, fetchurl, readline, tcp_wrappers, pcre, makeWrapper }:

     

       2
       2
        
       assert stdenv.isLinux;

     

       3
       3
       -
       assert stdenv.gcc.gcc != null;

     

       3
       3
       +
       assert stdenv.cc.gcc != null;

     

       4
       4
        
       let

     

       5
       5
        
       version = "0.7";

     

       6
       6
        
       debianPatch = fetchurl {

     
···

       18
       18
        
         buildInputs = [ readline tcp_wrappers pcre makeWrapper ];

     

       19
       19
        
         patches = [ debianPatch ];

     

       20
       20
        
         postInstall = ''

     

       21
       21
       -
           wrapProgram $out/sbin/atftpd --prefix LD_LIBRARY_PATH : ${stdenv.gcc.gcc}/lib${if stdenv.system == "x86_64-linux" then "64" else ""}

     

       21
       21
       +
           wrapProgram $out/sbin/atftpd --prefix LD_LIBRARY_PATH : ${stdenv.cc.gcc}/lib${if stdenv.system == "x86_64-linux" then "64" else ""}

     

       22
       22
        
         '';

     

       23
       23
        
         meta = {

     

       24
       24
        
           description = "Advanced tftp tools";

+2 -2

pkgs/tools/networking/dropbear/default.nix

···

       17
       17
        
       

     

       18
       18
        
         # http://www.gnu.org/software/make/manual/html_node/Libraries_002fSearch.html

     

       19
       19
        
         preConfigure = ''

     

       20
       20
       -
           makeFlags=VPATH=`cat $NIX_GCC/nix-support/orig-libc`/lib

     

       20
       20
       +
           makeFlags=VPATH=`cat $NIX_CC/nix-support/orig-libc`/lib

     

       21
       21
        
         '';

     

       22
       22
        
       

     

       23
       23
        
         crossAttrs = {

     

       24
       24
        
           # This works for uclibc, at least.

     

       25
       25
        
           preConfigure = ''

     

       26
       26
       -
             makeFlags=VPATH=`cat ${stdenv.gccCross}/nix-support/orig-libc`/lib

     

       26
       26
       +
             makeFlags=VPATH=`cat ${stdenv.ccCross}/nix-support/orig-libc`/lib

     

       27
       27
        
           '';

     

       28
       28
        
         };

     

       29
       29

+1 -1

pkgs/tools/networking/network-manager/default.nix

···

       47
       47
        
           [ ( substituteAll {

     

       48
       48
        
               src = ./nixos-purity.patch;

     

       49
       49
        
               inherit avahi dnsmasq ppp bind;

     

       50
       50
       -
               glibc = stdenv.gcc.libc;

     

       50
       50
       +
               glibc = stdenv.cc.libc;

     

       51
       51
        
             })

     

       52
       52
        
             ./libnl-3.2.25.patch

     

       53
       53
        
           ];

+1 -1

pkgs/tools/networking/ppp/default.nix

···

       13
       13
        
           [ ( substituteAll {

     

       14
       14
        
               src = ./nix-purity.patch;

     

       15
       15
        
               inherit libpcap;

     

       16
       16
       -
               glibc = stdenv.gcc.libc;

     

       16
       16
       +
               glibc = stdenv.cc.libc;

     

       17
       17
        
             })

     

       18
       18
        
             ./nonpriv.patch

     

       19
       19
        
           ];

+2 -2

pkgs/tools/package-management/nix-repl/default.nix

···

       20
       20
        
         installPhase =

     

       21
       21
        
           ''

     

       22
       22
        
             mkdir -p $out/bin

     

       23
       23
       -
             g++ -O3 -Wall -std=c++0x \

     

       23
       23
       +
             $CXX -O3 -Wall -std=c++0x \

     

       24
       24
        
               -o $out/bin/nix-repl nix-repl.cc \

     

       25
       25
        
               -I${nix}/include/nix \

     

       26
       26
        
               -lnixformat -lnixutil -lnixstore -lnixexpr -lnixmain -lreadline -lgc \

     

       27
       27
       -
               -DNIX_VERSION=${(builtins.parseDrvName nix.name).version}

     

       27
       27
       +
               -DNIX_VERSION=\"${(builtins.parseDrvName nix.name).version}\"

     

       28
       28
        
           '';

     

       29
       29
        
       

     

       30
       30
        
         meta = {

+1 -1

pkgs/tools/security/fprot/default.nix

···

       21
       21
        
           cp f-prot.conf.default $out/opt/f-prot/f-prot.conf

     

       22
       22
        
           ln -s $out/opt/f-prot/fpupdate $out/bin/fpupdate

     

       23
       23
        
       

     

       24
       24
       -
           patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" $out/opt/f-prot/fpupdate

     

       24
       24
       +
           patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/opt/f-prot/fpupdate

     

       25
       25
        
       

     

       26
       26
        
           mkdir -p $out/share/man/

     

       27
       27
        
           mkdir -p $out/share/man/man1

+2 -2

pkgs/tools/security/hashcat/default.nix

···

       4
       4
        
       

     

       5
       5
        
       let

     

       6
       6
        
         bits    = if stdenv.system == "x86_64-linux" then "64" else "32";

     

       7
       7
       -
         libPath = stdenv.lib.makeLibraryPath [ stdenv.gcc.libc ];

     

       7
       7
       +
         libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.libc ];

     

       8
       8
        
       

     

       9
       9
        
         fixBin = x: ''

     

       10
       10
       -
           patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \

     

       10
       10
       +
           patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \

     

       11
       11
        
             --set-rpath ${libPath} ${x}

     

       12
       12
        
         '';

     

       13
       13
        
       in

+3 -3

pkgs/tools/security/tor/torbrowser.nix

···

       9
       9
        
         torEnv = buildEnv {

     

       10
       10
        
           name = "tor-env";

     

       11
       11
        
           paths = [

     

       12
       12
       -
             stdenv.gcc.gcc zlib glib alsaLib dbus dbus_glib gtk atk pango freetype

     

       12
       12
       +
             stdenv.cc.gcc zlib glib alsaLib dbus dbus_glib gtk atk pango freetype

     

       13
       13
        
             fontconfig gdk_pixbuf cairo xlibs.libXrender xlibs.libX11 xlibs.libXext

     

       14
       14
        
             xlibs.libXt

     

       15
       15
        
           ];

     
···

       30
       30
        
         };

     

       31
       31
        
       

     

       32
       32
        
         patchPhase = ''

     

       33
       33
       -
           patchelf --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" Browser/firefox

     

       34
       34
       -
           patchelf --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" Browser/TorBrowser/Tor/tor

     

       33
       33
       +
           patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" Browser/firefox

     

       34
       34
       +
           patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" Browser/TorBrowser/Tor/tor

     

       35
       35
        
         '';

     

       36
       36
        
       

     

       37
       37
        
         doCheck = true;

+5 -5

pkgs/top-level/all-packages.nix

···

       3930
       3930
        
         win32hello = callPackage ../development/compilers/visual-c++/test { };

     

       3931
       3931
        
       

     

       3932
       3932
        
         wrapGCCWith = gccWrapper: glibc: baseGCC: gccWrapper {

     

       3933
       3933
       -
           nativeTools = stdenv.gcc.nativeTools or false;

     

       3934
       3934
       -
           nativeLibc = stdenv.gcc.nativeLibc or false;

     

       3935
       3935
       -
           nativePrefix = stdenv.gcc.nativePrefix or "";

     

       3933
       3933
       +
           nativeTools = stdenv.cc.nativeTools or false;

     

       3934
       3934
       +
           nativeLibc = stdenv.cc.nativeLibc or false;

     

       3935
       3935
       +
           nativePrefix = stdenv.cc.nativePrefix or "";

     

       3936
       3936
        
           gcc = baseGCC;

     

       3937
       3937
        
           libc = glibc;

     

       3938
       3938
        
           inherit stdenv binutils coreutils zlib;

     
···

       5980
       5980
        
         libiconvOrEmpty = if libiconvOrNull == null then [] else [libiconv];

     

       5981
       5981
        
       

     

       5982
       5982
        
         libiconvOrNull =

     

       5983
       5983
       -
           if gcc.libc or null != null || stdenv.isGlibc

     

       5983
       5983
       +
           if stdenv.cc.libc or null != null || stdenv.isGlibc

     

       5984
       5984
        
           then null

     

       5985
       5985
        
           else libiconv;

     

       5986
       5986
        
       

     
···

       11229
       11229
        
                 ++ lib.optional (cfg.enableTrezor or false) trezor-bridge

     

       11230
       11230
        
                );

     

       11231
       11231
        
             libs = [ gstreamer gst_plugins_base ] ++ lib.optionals (cfg.enableQuakeLive or false)

     

       11232
       11232
       -
                    (with xlibs; [ stdenv.gcc libX11 libXxf86dga libXxf86vm libXext libXt alsaLib zlib ]);

     

       11232
       11232
       +
                    (with xlibs; [ stdenv.cc libX11 libXxf86dga libXxf86vm libXext libXt alsaLib zlib ]);

     

       11233
       11233
        
             gst_plugins = [ gst_plugins_base gst_plugins_good gst_plugins_bad gst_plugins_ugly gst_ffmpeg ];

     

       11234
       11234
        
             gtk_modules = [ libcanberra ];

     

       11235
       11235
        
           };

+8 -8

pkgs/top-level/haskell-packages.nix

···

       368
       368
        
       

     

       369
       369
        
         cairo = callPackage ../development/libraries/haskell/cairo {

     

       370
       370
        
           inherit (pkgs) cairo zlib;

     

       371
       371
       -
           libc = pkgs.stdenv.gcc.libc;

     

       371
       371
       +
           libc = pkgs.stdenv.cc.libc;

     

       372
       372
        
         };

     

       373
       373
        
       

     

       374
       374
        
         carray = callPackage ../development/libraries/haskell/carray {};

     
···

       975
       975
        
         glade = callPackage ../development/libraries/haskell/glade {

     

       976
       976
        
           inherit (pkgs.gnome) libglade;

     

       977
       977
        
           gtkC = pkgs.gtk;

     

       978
       978
       -
           libc = pkgs.stdenv.gcc.libc;

     

       978
       978
       +
           libc = pkgs.stdenv.cc.libc;

     

       979
       979
        
         };

     

       980
       980
        
       

     

       981
       981
        
         GLFW = callPackage ../development/libraries/haskell/GLFW {};

     
···

       984
       984
        
       

     

       985
       985
        
         glib = callPackage ../development/libraries/haskell/glib {

     

       986
       986
        
           glib = pkgs.glib;

     

       987
       987
       -
           libc = pkgs.stdenv.gcc.libc;

     

       987
       987
       +
           libc = pkgs.stdenv.cc.libc;

     

       988
       988
        
         };

     

       989
       989
        
       

     

       990
       990
        
         Glob = callPackage ../development/libraries/haskell/Glob {};

     
···

       1023
       1023
        
       

     

       1024
       1024
        
         gtk = callPackage ../development/libraries/haskell/gtk {

     

       1025
       1025
        
           inherit (pkgs) gtk;

     

       1026
       1026
       -
           libc = pkgs.stdenv.gcc.libc;

     

       1026
       1026
       +
           libc = pkgs.stdenv.cc.libc;

     

       1027
       1027
        
         };

     

       1028
       1028
        
       

     

       1029
       1029
        
         gtk3 = callPackage ../development/libraries/haskell/gtk3 {

     
···

       1036
       1036
        
       

     

       1037
       1037
        
         gtksourceview2 = callPackage ../development/libraries/haskell/gtksourceview2 {

     

       1038
       1038
        
           inherit (pkgs.gnome) gtksourceview;

     

       1039
       1039
       -
           libc = pkgs.stdenv.gcc.libc;

     

       1039
       1039
       +
           libc = pkgs.stdenv.cc.libc;

     

       1040
       1040
        
         };

     

       1041
       1041
        
       

     

       1042
       1042
        
         gtkTraymanager = callPackage ../development/libraries/haskell/gtk-traymanager {};

     
···

       1902
       1902
        
       

     

       1903
       1903
        
         pango = callPackage ../development/libraries/haskell/pango {

     

       1904
       1904
        
           inherit (pkgs) pango;

     

       1905
       1905
       -
           libc = pkgs.stdenv.gcc.libc;

     

       1905
       1905
       +
           libc = pkgs.stdenv.cc.libc;

     

       1906
       1906
        
         };

     

       1907
       1907
        
       

     

       1908
       1908
        
         parallel_3_2_0_3 = callPackage ../development/libraries/haskell/parallel/3.2.0.3.nix {};

     
···

       2009
       2009
        
       

     

       2010
       2010
        
         poppler = callPackage ../development/libraries/haskell/poppler {

     

       2011
       2011
        
           popplerGlib = pkgs.poppler.poppler_glib;

     

       2012
       2012
       -
           libc = pkgs.stdenv.gcc.libc;

     

       2012
       2012
       +
           libc = pkgs.stdenv.cc.libc;

     

       2013
       2013
        
         };

     

       2014
       2014
        
       

     

       2015
       2015
        
         posixPaths = callPackage ../development/libraries/haskell/posix-paths {};

     
···

       2475
       2475
        
         stripe = callPackage ../development/libraries/haskell/stripe {};

     

       2476
       2476
        
       

     

       2477
       2477
        
         svgcairo = callPackage ../development/libraries/haskell/svgcairo {

     

       2478
       2478
       -
           libc = pkgs.stdenv.gcc.libc;

     

       2478
       2478
       +
           libc = pkgs.stdenv.cc.libc;

     

       2479
       2479
        
         };

     

       2480
       2480
        
       

     

       2481
       2481
        
         SVGFonts = callPackage ../development/libraries/haskell/SVGFonts {};