From e0ef28c12df6fe12ccfc1c29dcf4c9bb62891092 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 21 Sep 2017 15:55:22 +0200 Subject: fim: init at 0.5rc3 --- pkgs/tools/graphics/fim/default.nix | 40 +++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 pkgs/tools/graphics/fim/default.nix (limited to 'pkgs/tools/graphics') diff --git a/pkgs/tools/graphics/fim/default.nix b/pkgs/tools/graphics/fim/default.nix new file mode 100644 index 000000000000..e4a44d0784ef --- /dev/null +++ b/pkgs/tools/graphics/fim/default.nix @@ -0,0 +1,40 @@ +{ stdenv, fetchurl, autoconf, automake, pkgconfig, perl +, flex, bison, readline +, giflib, libtiff, libexif, libpng, libjpeg, jasper +, aalib, inkscape#, SDL, fig2dev, jasper # TODO +}: + +stdenv.mkDerivation rec { + name = "fim-${version}"; + version = "0.5rc3"; + + src = fetchurl { + url = mirror://savannah/fbi-improved/fim-0.5-rc3.tar.gz; + sha256 = "12aka85h469zfj0zcx3xdpan70gq8nf5rackgb1ldcl9mqjn50c2"; + }; + + postPatch = '' + substituteInPlace doc/vim2html.pl \ + --replace /usr/bin/perl ${perl}/bin/perl + ''; + + nativeBuildInputs = [ autoconf automake pkgconfig ]; + + buildInputs = [ + perl flex bison readline + giflib libtiff libexif libpng libjpeg jasper aalib inkscape + ]; + + meta = with stdenv.lib; { + description = "A lightweight, highly customizable and scriptable image viewer"; + longDescription = '' + FIM (Fbi IMproved) is a lightweight, console based image viewer that aims + to be a highly customizable and scriptable for users who are comfortable + with software like the VIM text editor or the Mutt mail user agent. + ''; + homepage = http://www.nongnu.org/fbi-improved/; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ primeos ]; + }; +} -- cgit 1.4.1 From a127f91f284ec001db70e92d487abcbbac7cde5f Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 21 Sep 2017 17:59:38 +0200 Subject: fim: Add X11 support and "USE flags" --- pkgs/tools/graphics/fim/default.nix | 28 ++++++++++++++++++++-------- pkgs/top-level/all-packages.nix | 3 +-- 2 files changed, 21 insertions(+), 10 deletions(-) (limited to 'pkgs/tools/graphics') 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 { }; -- cgit 1.4.1 From 570c0b3a7292e62a9014e6a2a6ed77b47b8dd52d Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Fri, 22 Sep 2017 00:23:39 +0200 Subject: transfig: cleanup and fix darwin clang --- pkgs/tools/graphics/transfig/builder.sh | 38 --------------------- pkgs/tools/graphics/transfig/default.nix | 57 ++++++++++++++++++++++++-------- 2 files changed, 43 insertions(+), 52 deletions(-) delete mode 100644 pkgs/tools/graphics/transfig/builder.sh (limited to 'pkgs/tools/graphics') diff --git a/pkgs/tools/graphics/transfig/builder.sh b/pkgs/tools/graphics/transfig/builder.sh deleted file mode 100644 index c466f759446c..000000000000 --- a/pkgs/tools/graphics/transfig/builder.sh +++ /dev/null @@ -1,38 +0,0 @@ -source $stdenv/setup - -patchPhase() { - for i in $patches; do - header "applying patch $i" 3 - patch -p0 < $i - stopNest - done - - configureImakefiles "s:__PREFIX_PNG:$libpng:" - configureImakefiles "s:__PREFIX:$out:" -} - -configureImakefiles() { - local sedcmd=$1 - - sed "${sedcmd}" fig2dev/Imakefile > tmpsed - cp tmpsed fig2dev/Imakefile - - sed "${sedcmd}" fig2dev/dev/Imakefile > tmpsed - cp tmpsed fig2dev/dev/Imakefile - - sed "${sedcmd}" transfig/Imakefile > tmpsed - cp tmpsed transfig/Imakefile -} - -buildPhase() { - xmkmf - make Makefiles - make -} - -preInstall() { - mkdir -p $out - mkdir -p $out/lib -} - -genericBuild diff --git a/pkgs/tools/graphics/transfig/default.nix b/pkgs/tools/graphics/transfig/default.nix index 948bba6d459f..cb3f0edff0f8 100644 --- a/pkgs/tools/graphics/transfig/default.nix +++ b/pkgs/tools/graphics/transfig/default.nix @@ -2,33 +2,62 @@ stdenv.mkDerivation rec { name = "transfig-3.2.4"; - builder = ./builder.sh; src = fetchurl { url = ftp://ftp.tex.ac.uk/pub/archive/graphics/transfig/transfig.3.2.4.tar.gz; sha256 = "0429snhp5acbz61pvblwlrwv8nxr6gf12p37f9xxwrkqv4ir7dd4"; }; buildInputs = [zlib libjpeg libpng imake]; - inherit libpng; - hardeningDisable = [ "format" ]; + patches = [ + ./patch-fig2dev-dev-Imakefile + ./patch-fig2dev-Imakefile + ./patch-transfig-Imakefile + ./patch-fig2dev-fig2dev.h + ./patch-fig2dev-dev-gensvg.c + ]; + + patchPhase = '' + runHook prePatch + + configureImakefiles() { + local sedcmd=$1 + + sed "$sedcmd" fig2dev/Imakefile > tmpsed + cp tmpsed fig2dev/Imakefile - patches = [prefixPatch1 prefixPatch2 prefixPatch3 varargsPatch gensvgPatch]; + sed "$sedcmd" fig2dev/dev/Imakefile > tmpsed + cp tmpsed fig2dev/dev/Imakefile - prefixPatch1 = - ./patch-fig2dev-dev-Imakefile; + sed "$sedcmd" transfig/Imakefile > tmpsed + cp tmpsed transfig/Imakefile + } - prefixPatch2 = - ./patch-fig2dev-Imakefile; + for i in $patches; do + header "applying patch $i" 3 + patch -p0 < $i + stopNest + done - prefixPatch3 = - ./patch-transfig-Imakefile; + configureImakefiles "s:__PREFIX_PNG:${libpng}:" + configureImakefiles "s:__PREFIX:$out:" - varargsPatch = - ./patch-fig2dev-fig2dev.h; + runHook postPatch + ''; - gensvgPatch = - ./patch-fig2dev-dev-gensvg.c; + preBuild = '' + xmkmf + make Makefiles + ''; + + makeFlags = [ "CC=cc" ]; + + preInstall = '' + mkdir -p $out + mkdir -p $out/lib + ''; + + hardeningDisable = [ "format" ]; meta = { platforms = stdenv.lib.platforms.unix; -- cgit 1.4.1 From 8d001911db29462a2efb2a23f5d9a1321cdc3235 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sat, 23 Sep 2017 19:25:56 +0200 Subject: asymptote: do not install sty-files, let texlive care of it TeXLive version is effectively identical anyway, and it caused an unneccessary file name collision. Fixes: #29671 --- pkgs/tools/graphics/asymptote/default.nix | 2 ++ 1 file changed, 2 insertions(+) (limited to 'pkgs/tools/graphics') diff --git a/pkgs/tools/graphics/asymptote/default.nix b/pkgs/tools/graphics/asymptote/default.nix index de3ba3621a88..6c6a93dc73ac 100644 --- a/pkgs/tools/graphics/asymptote/default.nix +++ b/pkgs/tools/graphics/asymptote/default.nix @@ -50,6 +50,8 @@ stdenv.mkDerivation { sed -i -e 's|(asymptote/asymptote)|(asymptote)|' $out/share/info/asymptote.info rmdir $out/share/info/asymptote rm $out/share/info/dir + + rm -rf "$out"/share/texmf ''; enableParallelBuilding = true; -- cgit 1.4.1