From af2ab0b911a153813789107b19f8066ee4414944 Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Wed, 22 Jul 2015 16:25:00 +0200 Subject: 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) --- pkgs/os-specific/linux/jfbview/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'pkgs/os-specific/linux/jfbview') diff --git a/pkgs/os-specific/linux/jfbview/default.nix b/pkgs/os-specific/linux/jfbview/default.nix index 4b371097ee6..34bf136ece7 100644 --- a/pkgs/os-specific/linux/jfbview/default.nix +++ b/pkgs/os-specific/linux/jfbview/default.nix @@ -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; -- cgit 1.4.1