lol

remove gcc49 overrides from various places

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 3064b6a0cc4dc047fae97bdffa0725bc7fd38f2e)

+8 -14
+2 -2
pkgs/development/libraries/bobcat/default.nix
··· 1 - { stdenv, fetchurl, gcc49, icmake, libmilter, libX11, openssl, readline 1 + { stdenv, fetchurl, icmake, libmilter, libX11, openssl, readline 2 2 , utillinux, yodl }: 3 3 4 4 let version = "3.25.02"; in ··· 19 19 maintainers = with maintainers; [ nckx ]; 20 20 }; 21 21 22 - buildInputs = [ gcc49 libmilter libX11 openssl readline utillinux ]; 22 + buildInputs = [ libmilter libX11 openssl readline utillinux ]; 23 23 nativeBuildInputs = [ icmake yodl ]; 24 24 25 25 postPatch = ''
+2 -2
pkgs/development/tools/parsing/flexc++/default.nix
··· 1 - { stdenv, fetchurl, bobcat, gcc49, icmake, yodl }: 1 + { stdenv, fetchurl, bobcat, icmake, yodl }: 2 2 3 3 let version = "2.02.00"; in 4 4 stdenv.mkDerivation rec { ··· 24 24 maintainers = with maintainers; [ nckx ]; 25 25 }; 26 26 27 - buildInputs = [ bobcat gcc49 ]; 27 + buildInputs = [ bobcat ]; 28 28 nativeBuildInputs = [ icmake yodl ]; 29 29 30 30 postPatch = ''
+2 -3
pkgs/os-specific/linux/jfbview/default.nix
··· 1 - # FIXME: remove gcc49 when the default gcc supports C++1y 2 - { stdenv, fetchFromGitHub, freetype, gcc49, imlib2, jbig2dec, libjpeg, libX11 1 + { stdenv, fetchFromGitHub, freetype, imlib2, jbig2dec, libjpeg, libX11 3 2 , mujs, mupdf, ncurses, openjpeg, openssl }: 4 3 5 4 let ··· 16 15 owner = "jichu4n"; 17 16 }; 18 17 19 - buildInputs = [ freetype gcc49 imlib2 jbig2dec libjpeg libX11 mujs mupdf 18 + buildInputs = [ freetype imlib2 jbig2dec libjpeg libX11 mujs mupdf 20 19 ncurses openjpeg openssl ]; 21 20 22 21 buildFlags = binaries;
+2 -7
pkgs/top-level/all-packages.nix
··· 3134 3134 3135 3135 torbutton = callPackage ../tools/security/torbutton { }; 3136 3136 3137 - torbrowser = callPackage ../tools/security/tor/torbrowser.nix { 3138 - stdenv = overrideCC stdenv gcc49; 3139 - }; 3137 + torbrowser = callPackage ../tools/security/tor/torbrowser.nix { }; 3140 3138 3141 3139 touchegg = callPackage ../tools/inputmethods/touchegg { }; 3142 3140 ··· 10841 10839 clipit = callPackage ../applications/misc/clipit { }; 10842 10840 10843 10841 bomi = callPackage ../applications/video/bomi { 10844 - stdenv = overrideCC stdenv gcc49; 10845 10842 pulseSupport = config.pulseaudio or true; 10846 10843 }; 10847 10844 ··· 13402 13399 zathuraCollection = recurseIntoAttrs 13403 13400 (let callPackage = newScope pkgs.zathuraCollection; in 13404 13401 import ../applications/misc/zathura { 13405 - inherit callPackage pkgs fetchurl lib; 13406 - stdenv = overrideCC stdenv gcc49; 13402 + inherit stdenv callPackage pkgs fetchurl lib; 13407 13403 useMupdf = config.zathura.useMupdf or false; 13408 13404 }); 13409 13405 ··· 13417 13413 13418 13414 girara = callPackage ../applications/misc/girara { 13419 13415 gtk = gtk3; 13420 - stdenv = overrideCC stdenv gcc49; 13421 13416 }; 13422 13417 13423 13418 girara-light = callPackage ../applications/misc/girara {