diff options
| -rw-r--r-- | pkgs/tools/graphics/fim/default.nix | 28 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 3 |
2 files changed, 21 insertions, 10 deletions
diff --git a/pkgs/tools/graphics/fim/default.nix b/pkgs/tools/graphics/fim/default.nix index e4a44d0784ef..c7a22f00dce7 100644 --- a/pkgs/tools/graphics/fim/default.nix +++ b/pkgs/tools/graphics/fim/default.nix @@ -1,7 +1,12 @@ -{ stdenv, fetchurl, autoconf, automake, pkgconfig, perl -, flex, bison, readline -, giflib, libtiff, libexif, libpng, libjpeg, jasper -, aalib, inkscape#, SDL, fig2dev, jasper # TODO +{ stdenv, fetchurl, autoconf, automake, pkgconfig +, perl, flex, bison, readline, libexif +, x11Support ? true, SDL +, svgSupport ? true, inkscape +, asciiArtSupport ? true, aalib +, gifSupport ? true, giflib +, tiffSupport ? true, libtiff +, jpegSupport ? true, libjpeg +, pngSupport ? true, libpng }: stdenv.mkDerivation rec { @@ -20,10 +25,17 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoconf automake pkgconfig ]; - buildInputs = [ - perl flex bison readline - giflib libtiff libexif libpng libjpeg jasper aalib inkscape - ]; + buildInputs = with stdenv.lib; + [ perl flex bison readline libexif ] + ++ optional x11Support SDL + ++ optional svgSupport inkscape + ++ optional asciiArtSupport aalib + ++ optional gifSupport giflib + ++ optional tiffSupport libtiff + ++ optional jpegSupport libjpeg + ++ optional pngSupport libpng; + + NIX_CFLAGS_COMPILE = stdenv.lib.optional x11Support "-lSDL"; meta = with stdenv.lib; { description = "A lightweight, highly customizable and scriptable image viewer"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 352b24a1c471..0f1392f71390 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2014,8 +2014,7 @@ with pkgs; fdk_aac = callPackage ../development/libraries/fdk-aac { }; - # WIP: fim - fimFull = callPackage ../tools/graphics/fim { }; + fim = callPackage ../tools/graphics/fim { }; flac123 = callPackage ../applications/audio/flac123 { }; |