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 3064b6a0cc)
This commit is contained in:
Vladimír Čunát
2015-07-23 11:53:18 +02:00
parent 95685e962d
commit af2ab0b911
4 changed files with 8 additions and 14 deletions
+2 -3
View File
@@ -1,5 +1,4 @@
# FIXME: remove gcc49 when the default gcc supports C++1y
{ stdenv, fetchFromGitHub, freetype, gcc49, imlib2, jbig2dec, libjpeg, libX11
{ stdenv, fetchFromGitHub, freetype, imlib2, jbig2dec, libjpeg, libX11
, mujs, mupdf, ncurses, openjpeg, openssl }:
let
@@ -16,7 +15,7 @@ stdenv.mkDerivation rec {
owner = "jichu4n";
};
buildInputs = [ freetype gcc49 imlib2 jbig2dec libjpeg libX11 mujs mupdf
buildInputs = [ freetype imlib2 jbig2dec libjpeg libX11 mujs mupdf
ncurses openjpeg openssl ];
buildFlags = binaries;