diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2015-07-22 16:25:00 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2015-07-23 11:53:18 +0200 |
| commit | af2ab0b911a153813789107b19f8066ee4414944 (patch) | |
| tree | 0a85b364ba7d1e2c2a98822edd32b7febafb4f4c /pkgs/os-specific/linux/jfbview | |
| parent | 95685e962d7c2e5ec5a22be5136df238afcbf305 (diff) | |
| download | nixpkgs-af2ab0b911a153813789107b19f8066ee4414944.tar nixpkgs-af2ab0b911a153813789107b19f8066ee4414944.tar.gz nixpkgs-af2ab0b911a153813789107b19f8066ee4414944.tar.bz2 nixpkgs-af2ab0b911a153813789107b19f8066ee4414944.tar.lz nixpkgs-af2ab0b911a153813789107b19f8066ee4414944.tar.xz nixpkgs-af2ab0b911a153813789107b19f8066ee4414944.tar.zst nixpkgs-af2ab0b911a153813789107b19f8066ee4414944.zip | |
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)
Diffstat (limited to 'pkgs/os-specific/linux/jfbview')
| -rw-r--r-- | pkgs/os-specific/linux/jfbview/default.nix | 5 |
1 files changed, 2 insertions, 3 deletions
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; |