From b9cbe0f8e75c8dfec9702213a91e184a2ae2db86 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 6 Jan 2021 19:01:15 +0100 Subject: [PATCH] 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 --- pkgs/tools/graphics/fim/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/graphics/fim/default.nix b/pkgs/tools/graphics/fim/default.nix index 6a3d9a29db3..9a3163951d2 100644 --- a/pkgs/tools/graphics/fim/default.nix +++ b/pkgs/tools/graphics/fim/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoconf, automake, pkgconfig +{ gcc9Stdenv, fetchurl, autoconf, automake, pkgconfig, lib , perl, flex, bison, readline, libexif , x11Support ? true, SDL , svgSupport ? true, inkscape @@ -9,7 +9,7 @@ , pngSupport ? true, libpng }: -stdenv.mkDerivation rec { +gcc9Stdenv.mkDerivation rec { pname = "fim"; version = "0.6"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoconf automake pkgconfig ]; - buildInputs = with stdenv.lib; + buildInputs = with lib; [ perl flex bison readline libexif ] ++ optional x11Support SDL ++ optional svgSupport inkscape @@ -35,9 +35,9 @@ stdenv.mkDerivation rec { ++ optional jpegSupport libjpeg ++ 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"; longDescription = '' FIM (Fbi IMproved) is a lightweight, console based image viewer that aims