mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-12-26 12:53:59 +03:00
fim: Fix the build by switching back to GCC 9
GCC 10 breaks the build: https://hydra.nixos.org/build/134272249 There are workarounds to fix the build with GCC 10 [0] but since upstream is inactive it's probably best to deprecate fim soon. [0]: https://aur.archlinux.org/cgit/aur.git/commit/?h=fim&id=66258387a099da72f7758495fb0e3c93e16068e7
This commit is contained in:
parent
4746e1717f
commit
b9cbe0f8e7
@ -1,4 +1,4 @@
|
|||||||
{ stdenv, fetchurl, autoconf, automake, pkgconfig
|
{ gcc9Stdenv, fetchurl, autoconf, automake, pkgconfig, lib
|
||||||
, perl, flex, bison, readline, libexif
|
, perl, flex, bison, readline, libexif
|
||||||
, x11Support ? true, SDL
|
, x11Support ? true, SDL
|
||||||
, svgSupport ? true, inkscape
|
, svgSupport ? true, inkscape
|
||||||
@ -9,7 +9,7 @@
|
|||||||
, pngSupport ? true, libpng
|
, pngSupport ? true, libpng
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
gcc9Stdenv.mkDerivation rec {
|
||||||
pname = "fim";
|
pname = "fim";
|
||||||
version = "0.6";
|
version = "0.6";
|
||||||
|
|
||||||
@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
nativeBuildInputs = [ autoconf automake pkgconfig ];
|
nativeBuildInputs = [ autoconf automake pkgconfig ];
|
||||||
|
|
||||||
buildInputs = with stdenv.lib;
|
buildInputs = with lib;
|
||||||
[ perl flex bison readline libexif ]
|
[ perl flex bison readline libexif ]
|
||||||
++ optional x11Support SDL
|
++ optional x11Support SDL
|
||||||
++ optional svgSupport inkscape
|
++ optional svgSupport inkscape
|
||||||
@ -35,9 +35,9 @@ stdenv.mkDerivation rec {
|
|||||||
++ optional jpegSupport libjpeg
|
++ optional jpegSupport libjpeg
|
||||||
++ optional pngSupport libpng;
|
++ optional pngSupport libpng;
|
||||||
|
|
||||||
NIX_CFLAGS_COMPILE = stdenv.lib.optionalString x11Support "-lSDL";
|
NIX_CFLAGS_COMPILE = lib.optionalString x11Support "-lSDL";
|
||||||
|
|
||||||
meta = with stdenv.lib; {
|
meta = with lib; {
|
||||||
description = "A lightweight, highly customizable and scriptable image viewer";
|
description = "A lightweight, highly customizable and scriptable image viewer";
|
||||||
longDescription = ''
|
longDescription = ''
|
||||||
FIM (Fbi IMproved) is a lightweight, console based image viewer that aims
|
FIM (Fbi IMproved) is a lightweight, console based image viewer that aims
|
||||||
|
Loading…
Reference in New Issue
Block a user