alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

remove gcc49 overrides from various places

Browse source 
An interesting thing is that: stdenv != overrideCC stdenv gcc49;
I'm not sure why that is, but it doesn't seem important.

/cc maintainers: @nckx, @garbas, @abbradar, @cstrahan, @grwlf.

(cherry picked from commit 3064b6a0cc)
This commit is contained in:
Vladimír Čunát 2015-07-22 16:25:00 +02:00
parent 95685e962d
commit af2ab0b911
4 changed files with 8 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/development/libraries/bobcat/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, gcc49, icmake, libmilter, libX11, openssl, readline { stdenv, fetchurl, icmake, libmilter, libX11, openssl, readline
, utillinux, yodl }: , utillinux, yodl }:
let version = "3.25.02"; in let version = "3.25.02"; in
@ -19,7 +19,7 @@ stdenv.mkDerivation {
maintainers = with maintainers; [ nckx ]; maintainers = with maintainers; [ nckx ];
}; };
buildInputs = [ gcc49 libmilter libX11 openssl readline utillinux ]; buildInputs = [ libmilter libX11 openssl readline utillinux ];
nativeBuildInputs = [ icmake yodl ]; nativeBuildInputs = [ icmake yodl ];
postPatch = '' postPatch = ''

4
pkgs/development/tools/parsing/flexc++/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, bobcat, gcc49, icmake, yodl }: { stdenv, fetchurl, bobcat, icmake, yodl }:
let version = "2.02.00"; in let version = "2.02.00"; in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ nckx ]; maintainers = with maintainers; [ nckx ];
}; };
buildInputs = [ bobcat gcc49 ]; buildInputs = [ bobcat ];
nativeBuildInputs = [ icmake yodl ]; nativeBuildInputs = [ icmake yodl ];
postPatch = '' postPatch = ''

5
pkgs/os-specific/linux/jfbview/default.nix
View file

@ -1,5 +1,4 @@
# FIXME: remove gcc49 when the default gcc supports C++1y { stdenv, fetchFromGitHub, freetype, imlib2, jbig2dec, libjpeg, libX11
{ stdenv, fetchFromGitHub, freetype, gcc49, imlib2, jbig2dec, libjpeg, libX11
, mujs, mupdf, ncurses, openjpeg, openssl }: , mujs, mupdf, ncurses, openjpeg, openssl }:
let let
@ -16,7 +15,7 @@ stdenv.mkDerivation rec {
owner = "jichu4n"; owner = "jichu4n";
}; };
buildInputs = [ freetype gcc49 imlib2 jbig2dec libjpeg libX11 mujs mupdf buildInputs = [ freetype imlib2 jbig2dec libjpeg libX11 mujs mupdf
ncurses openjpeg openssl ]; ncurses openjpeg openssl ];
buildFlags = binaries; buildFlags = binaries;

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

@ -3134,9 +3134,7 @@ let
torbutton = callPackage ../tools/security/torbutton { }; torbutton = callPackage ../tools/security/torbutton { };
torbrowser = callPackage ../tools/security/tor/torbrowser.nix { torbrowser = callPackage ../tools/security/tor/torbrowser.nix { };
stdenv = overrideCC stdenv gcc49;
};
touchegg = callPackage ../tools/inputmethods/touchegg { }; touchegg = callPackage ../tools/inputmethods/touchegg { };
@ -10841,7 +10839,6 @@ let
clipit = callPackage ../applications/misc/clipit { }; clipit = callPackage ../applications/misc/clipit { };
bomi = callPackage ../applications/video/bomi { bomi = callPackage ../applications/video/bomi {
stdenv = overrideCC stdenv gcc49;
pulseSupport = config.pulseaudio or true; pulseSupport = config.pulseaudio or true;
}; };
@ -13402,8 +13399,7 @@ let
zathuraCollection = recurseIntoAttrs zathuraCollection = recurseIntoAttrs
(let callPackage = newScope pkgs.zathuraCollection; in (let callPackage = newScope pkgs.zathuraCollection; in
import ../applications/misc/zathura { import ../applications/misc/zathura {
inherit callPackage pkgs fetchurl lib; inherit stdenv callPackage pkgs fetchurl lib;
stdenv = overrideCC stdenv gcc49;
useMupdf = config.zathura.useMupdf or false; useMupdf = config.zathura.useMupdf or false;
}); });
@ -13417,7 +13413,6 @@ let
girara = callPackage ../applications/misc/girara { girara = callPackage ../applications/misc/girara {
gtk = gtk3; gtk = gtk3;
stdenv = overrideCC stdenv gcc49;
}; };
girara-light = callPackage ../applications/misc/girara { girara-light = callPackage ../applications/misc/girara {