diff options
| author | Eric Seidel <gridaphobe@gmail.com> | 2015-01-14 20:25:26 -0800 |
|---|---|---|
| committer | Eric Seidel <gridaphobe@gmail.com> | 2015-01-14 20:27:55 -0800 |
| commit | f3c6827373be102caae5dcbadd31e73ed60fa17f (patch) | |
| tree | 9f9d57c16edc218bd590ca9956eb5227d084c33f /pkgs/misc | |
| parent | 16fe4be790f541d68c01897640fda11f9673b8e9 (diff) | |
| download | nixpkgs-f3c6827373be102caae5dcbadd31e73ed60fa17f.tar nixpkgs-f3c6827373be102caae5dcbadd31e73ed60fa17f.tar.gz nixpkgs-f3c6827373be102caae5dcbadd31e73ed60fa17f.tar.bz2 nixpkgs-f3c6827373be102caae5dcbadd31e73ed60fa17f.tar.lz nixpkgs-f3c6827373be102caae5dcbadd31e73ed60fa17f.tar.xz nixpkgs-f3c6827373be102caae5dcbadd31e73ed60fa17f.tar.zst nixpkgs-f3c6827373be102caae5dcbadd31e73ed60fa17f.zip | |
rename all occurrences of stdenv.cc.gcc to stdenv.cc.cc
Diffstat (limited to 'pkgs/misc')
| -rw-r--r-- | pkgs/misc/drivers/gutenprint/bin.nix | 2 | ||||
| -rw-r--r-- | pkgs/misc/emulators/wine/stable.nix | 6 | ||||
| -rw-r--r-- | pkgs/misc/emulators/wine/unstable.nix | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/misc/drivers/gutenprint/bin.nix b/pkgs/misc/drivers/gutenprint/bin.nix index 828fbb8884b..b5ab61edb95 100644 --- a/pkgs/misc/drivers/gutenprint/bin.nix +++ b/pkgs/misc/drivers/gutenprint/bin.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation { phases = "buildPhase"; - libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.gcc zlib ]; + libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc zlib ]; buildPhase = '' ar -x $src data.tar.gz diff --git a/pkgs/misc/emulators/wine/stable.nix b/pkgs/misc/emulators/wine/stable.nix index 49591a3f38f..bdf696f541f 100644 --- a/pkgs/misc/emulators/wine/stable.nix +++ b/pkgs/misc/emulators/wine/stable.nix @@ -4,7 +4,7 @@ }: assert stdenv.isLinux; -assert stdenv.cc.gcc != null; +assert stdenv.cc.cc.isGNU or false; let version = "1.6.2"; @@ -46,7 +46,7 @@ in stdenv.mkDerivation rec { # them to the RPATH so that the user doesn't have to set them in # LD_LIBRARY_PATH. NIX_LDFLAGS = map (path: "-rpath ${path}/lib ") [ - freetype fontconfig stdenv.cc.gcc mesa mesa_noglu.osmesa libdrm + freetype fontconfig stdenv.cc.cc mesa mesa_noglu.osmesa libdrm xlibs.libXinerama xlibs.libXrender xlibs.libXrandr xlibs.libXcursor xlibs.libXcomposite libpng libjpeg openssl gnutls cups @@ -65,7 +65,7 @@ in stdenv.mkDerivation rec { paxmark psmr $out/bin/wine{,-preloader} - wrapProgram $out/bin/wine --prefix LD_LIBRARY_PATH : ${stdenv.cc.gcc}/lib + wrapProgram $out/bin/wine --prefix LD_LIBRARY_PATH : ${stdenv.cc.cc}/lib ''; enableParallelBuilding = true; diff --git a/pkgs/misc/emulators/wine/unstable.nix b/pkgs/misc/emulators/wine/unstable.nix index edeb2bdb990..bc941fc3ffc 100644 --- a/pkgs/misc/emulators/wine/unstable.nix +++ b/pkgs/misc/emulators/wine/unstable.nix @@ -4,7 +4,7 @@ }: assert stdenv.isLinux; -assert stdenv.cc.gcc != null; +assert stdenv.cc.cc.isGNU or false; let version = "1.7.34"; @@ -46,7 +46,7 @@ in stdenv.mkDerivation rec { # them to the RPATH so that the user doesn't have to set them in # LD_LIBRARY_PATH. NIX_LDFLAGS = map (path: "-rpath ${path}/lib ") [ - freetype fontconfig stdenv.cc.gcc mesa mesa_noglu.osmesa libdrm + freetype fontconfig stdenv.cc.cc mesa mesa_noglu.osmesa libdrm xlibs.libXinerama xlibs.libXrender xlibs.libXrandr xlibs.libXcursor xlibs.libXcomposite libpng libjpeg openssl gnutls cups ncurses @@ -62,7 +62,7 @@ in stdenv.mkDerivation rec { install -D ${gecko} $out/share/wine/gecko/${gecko64.name} '' + '' install -D ${mono} $out/share/wine/mono/${mono.name} - wrapProgram $out/bin/wine --prefix LD_LIBRARY_PATH : ${stdenv.cc.gcc}/lib + wrapProgram $out/bin/wine --prefix LD_LIBRARY_PATH : ${stdenv.cc.cc}/lib ''; enableParallelBuilding = true; |