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

Change occurrences of gcc to the more general cc

Browse Source 
This is done for the sake of Yosemite, which does not have gcc, and yet
this change is also compatible with Linux.
This commit is contained in:
John Wiegley
2014-12-26 11:06:21 -06:00
parent ce100a5d58
commit 28b6fb61e6
252 changed files with 553 additions and 540 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/security/fprot/default.nix
+1 -1
View File
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
cp f-prot.conf.default $out/opt/f-prot/f-prot.conf
ln -s $out/opt/f-prot/fpupdate $out/bin/fpupdate
patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" $out/opt/f-prot/fpupdate
patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/opt/f-prot/fpupdate
mkdir -p $out/share/man/
mkdir -p $out/share/man/man1
pkgs/tools/security/hashcat/default.nix
+2 -2
View File
@@ -4,10 +4,10 @@ assert stdenv.isLinux;
let
bits = if stdenv.system == "x86_64-linux" then "64" else "32";
libPath = stdenv.lib.makeLibraryPath [ stdenv.gcc.libc ];
libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.libc ];
fixBin = x: ''
patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-rpath ${libPath} ${x}
'';
in
pkgs/tools/security/tor/torbrowser.nix
+3 -3
View File
@@ -9,7 +9,7 @@ let
torEnv = buildEnv {
name = "tor-env";
paths = [
stdenv.gcc.gcc zlib glib alsaLib dbus dbus_glib gtk atk pango freetype
stdenv.cc.gcc zlib glib alsaLib dbus dbus_glib gtk atk pango freetype
fontconfig gdk_pixbuf cairo xlibs.libXrender xlibs.libX11 xlibs.libXext
xlibs.libXt
];
@@ -30,8 +30,8 @@ in stdenv.mkDerivation rec {
};
patchPhase = ''
patchelf --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" Browser/firefox
patchelf --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" Browser/TorBrowser/Tor/tor
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" Browser/firefox
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" Browser/TorBrowser/Tor/tor
'';
doCheck = true;