diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2016-03-08 09:57:58 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2016-03-08 09:58:19 +0100 |
commit | 09af15654f0c8091f1b9e0bbb2e523cdee194442 (patch) | |
tree | e648edef1ce4c64c533f2593aa22b8015cf0e506 /pkgs/applications/graphics | |
parent | f306e67e15bdbe9a8358c9f81319fc4fcbadc2eb (diff) | |
parent | 0ee75214f336474e127c2e3546c0406a0c4d5fa7 (diff) | |
download | nixlib-09af15654f0c8091f1b9e0bbb2e523cdee194442.tar nixlib-09af15654f0c8091f1b9e0bbb2e523cdee194442.tar.gz nixlib-09af15654f0c8091f1b9e0bbb2e523cdee194442.tar.bz2 nixlib-09af15654f0c8091f1b9e0bbb2e523cdee194442.tar.lz nixlib-09af15654f0c8091f1b9e0bbb2e523cdee194442.tar.xz nixlib-09af15654f0c8091f1b9e0bbb2e523cdee194442.tar.zst nixlib-09af15654f0c8091f1b9e0bbb2e523cdee194442.zip |
Merge master into closure-size
The kde-5 stuff still didn't merge well. I hand-fixed what I saw, but there may be more problems.
Diffstat (limited to 'pkgs/applications/graphics')
-rw-r--r-- | pkgs/applications/graphics/ImageMagick/default.nix | 1 | ||||
-rw-r--r-- | pkgs/applications/graphics/PythonMagick/default.nix | 6 | ||||
-rw-r--r-- | pkgs/applications/graphics/ahoviewer/default.nix | 36 | ||||
-rw-r--r-- | pkgs/applications/graphics/apitrace/default.nix | 12 | ||||
-rw-r--r-- | pkgs/applications/graphics/gimp/2.8.nix | 6 | ||||
-rw-r--r-- | pkgs/applications/graphics/gimp/plugins/default.nix | 6 | ||||
-rw-r--r-- | pkgs/applications/graphics/gimp/wrapper.nix | 33 | ||||
-rw-r--r-- | pkgs/applications/graphics/glabels/default.nix | 38 | ||||
-rw-r--r-- | pkgs/applications/graphics/hugin/default.nix | 31 | ||||
-rw-r--r-- | pkgs/applications/graphics/inkscape/default.nix | 6 | ||||
-rw-r--r-- | pkgs/applications/graphics/jbrout/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/graphics/mcomix/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/graphics/mirage/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/graphics/sane/backends/git.nix | 6 | ||||
-rw-r--r-- | pkgs/applications/graphics/simple-scan/default.nix | 6 | ||||
-rw-r--r-- | pkgs/applications/graphics/xara/default.nix | 4 |
16 files changed, 158 insertions, 45 deletions
diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index 8fa86041414f..e75e86a4d533 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -7,6 +7,7 @@ let arch = if stdenv.system == "i686-linux" then "i686" else if stdenv.system == "x86_64-linux" || stdenv.system == "x86_64-darwin" then "x86-64" + else if stdenv.system == "armv7l-linux" then "armv7l" else throw "ImageMagick is not supported on this platform."; in diff --git a/pkgs/applications/graphics/PythonMagick/default.nix b/pkgs/applications/graphics/PythonMagick/default.nix index 17bf7d546709..5ab7d4d8a694 100644 --- a/pkgs/applications/graphics/PythonMagick/default.nix +++ b/pkgs/applications/graphics/PythonMagick/default.nix @@ -2,7 +2,7 @@ let - version = "0.9.11"; + version = "0.9.12"; in @@ -10,8 +10,8 @@ stdenv.mkDerivation rec { name = "pythonmagick-${version}"; src = fetchurl { - url = "http://www.imagemagick.org/download/python/releases/PythonMagick-${version}.tar.gz"; - sha256 = "01z01mlqkk0lvrh2jsmf84qjw29sq4rpj0653x7nqy7mrszwwp2v"; + url = "http://www.imagemagick.org/download/python/releases/PythonMagick-${version}.tar.xz"; + sha256 = "1l1kr3d7l40fkxgs6mrlxj65alv2jizm9hhgg9i9g90a8qj8642b"; }; buildInputs = [python boost pkgconfig imagemagick]; diff --git a/pkgs/applications/graphics/ahoviewer/default.nix b/pkgs/applications/graphics/ahoviewer/default.nix new file mode 100644 index 000000000000..79d6ff06578c --- /dev/null +++ b/pkgs/applications/graphics/ahoviewer/default.nix @@ -0,0 +1,36 @@ +{ stdenv, pkgs, fetchurl, fetchFromGitHub, pkgconfig, libconfig, + gtkmm, glibmm, libxml2, libsecret, curl, unrar, libzip, + librsvg, gst_all_1, autoreconfHook, makeWrapper }: +stdenv.mkDerivation { + name = "ahoviewer-1.4.6"; + src = fetchFromGitHub { + owner = "ahodesuka"; + repo = "ahoviewer"; + rev = "414cb91d66d96fab4b48593a7ef4d9ad461306aa"; + sha256 = "081jgfmbwf2av0cn229cf4qyv6ha80ridymsgwq45124b78y2bmb"; + }; + enableParallelBuilding = true; + nativeBuildInputs = [ autoreconfHook pkgconfig makeWrapper ]; + buildInputs = [ glibmm libconfig gtkmm glibmm libxml2 + libsecret curl unrar libzip librsvg + gst_all_1.gstreamer + gst_all_1.gst-plugins-good + gst_all_1.gst-plugins-bad + gst_all_1.gst-libav + gst_all_1.gst-plugins-base ]; + postPatch = ''patchShebangs version.sh''; + postInstall = '' + wrapProgram $out/bin/ahoviewer \ + --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" \ + --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" + ''; + meta = { + homepage = "https://github.com/ahodesuka/ahoviewer"; + description = "A GTK2 image viewer, manga reader, and booru browser"; + maintainers = [ stdenv.lib.maintainers.skrzyp ]; + license = stdenv.lib.licenses.mit; + platforms = stdenv.lib.platforms.allBut [ "darwin" "cygwin" ]; + }; +} + + diff --git a/pkgs/applications/graphics/apitrace/default.nix b/pkgs/applications/graphics/apitrace/default.nix index f54628e0b8de..e130b23a8aaa 100644 --- a/pkgs/applications/graphics/apitrace/default.nix +++ b/pkgs/applications/graphics/apitrace/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, libX11, procps, python, qtbase }: +{ stdenv, fetchFromGitHub, cmake, libX11, procps, python, libdwarf, qtbase, qtwebkit }: stdenv.mkDerivation rec { name = "apitrace-${version}"; @@ -11,13 +11,11 @@ stdenv.mkDerivation rec { owner = "apitrace"; }; - buildInputs = [ libX11 procps python qtbase ]; - nativeBuildInputs = [ cmake ]; + # LD_PRELOAD wrappers need to be statically linked to work against all kinds + # of games -- so it's fine to use e.g. bundled snappy. + buildInputs = [ libX11 procps python libdwarf qtbase qtwebkit ]; - buildPhase = '' - cmake - make - ''; + nativeBuildInputs = [ cmake ]; meta = with stdenv.lib; { homepage = https://apitrace.github.io; diff --git a/pkgs/applications/graphics/gimp/2.8.nix b/pkgs/applications/graphics/gimp/2.8.nix index 1184a498c668..b09838656929 100644 --- a/pkgs/applications/graphics/gimp/2.8.nix +++ b/pkgs/applications/graphics/gimp/2.8.nix @@ -6,6 +6,12 @@ stdenv.mkDerivation rec { name = "gimp-2.8.16"; + # This declarations for `gimp-with-plugins` wrapper, + # (used for determining $out/lib/gimp/${majorVersion}/ paths) + majorVersion = "2.0"; + targetPluginDir = "$out/lib/gimp/${majorVersion}/plug-ins"; + targetScriptDir = "$out/lib/gimp/${majorVersion}/scripts"; + src = fetchurl { url = "http://download.gimp.org/pub/gimp/v2.8/${name}.tar.bz2"; sha256 = "1dsgazia9hmab8cw3iis7s69dvqyfj5wga7ds7w2q5mms1xqbqwm"; diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix index 702911fee744..4084018d1d53 100644 --- a/pkgs/applications/graphics/gimp/plugins/default.nix +++ b/pkgs/applications/graphics/gimp/plugins/default.nix @@ -6,9 +6,7 @@ { pkgs, gimp }: let inherit (pkgs) stdenv fetchurl pkgconfig glib; - targetPluginDir = "$out/${gimp.name}-plugins"; - targetScriptDir = "$out/${gimp.name}-scripts"; - prefix = "plugin-gimp-"; + inherit (gimp) targetPluginDir targetScriptDir; pluginDerivation = a: stdenv.mkDerivation ({ prePhases = "extraLib"; @@ -52,7 +50,7 @@ rec { name = "gap-2.6.0"; buildInputs = [ gimp pkgconfig glib pkgs.intltool gimp.gtk ] ++ gimp.nativeBuildInputs; src = fetchurl { - url = ftp://ftp.gimp.org/pub/gimp/plug-ins/v2.6/gap/gimp-gap-2.6.0.tar.bz2; + url = http://ftp.gimp.org/pub/gimp/plug-ins/v2.6/gap/gimp-gap-2.6.0.tar.bz2; sha256 = "1jic7ixcmsn4kx2cn32nc5087rk6g8xsrz022xy11yfmgvhzb0ql"; }; patchPhase = '' diff --git a/pkgs/applications/graphics/gimp/wrapper.nix b/pkgs/applications/graphics/gimp/wrapper.nix new file mode 100644 index 000000000000..53067dc39c9a --- /dev/null +++ b/pkgs/applications/graphics/gimp/wrapper.nix @@ -0,0 +1,33 @@ +{ stdenv, lib, buildEnv, gimp, makeWrapper, gimpPlugins, plugins ? null}: + +let +allPlugins = lib.filter (pkg: builtins.isAttrs pkg && pkg.type == "derivation") (lib.attrValues gimpPlugins); +selectedPlugins = if plugins == null then allPlugins else plugins; +extraArgs = map (x: x.wrapArgs or "") selectedPlugins; + +drv = buildEnv { + name = "gimp-with-plugins-" + (builtins.parseDrvName gimp.name).version; + + paths = [ gimp ] ++ selectedPlugins; + + postBuild = '' + # TODO: This could be avoided if buildEnv could be forced to create all directories + if [ -L $out/bin ]; then + rm $out/bin + mkdir $out/bin + for i in ${gimp}/bin/*; do + ln -s $i $out/bin + done + fi + for each in gimp-2.8 gimp-console-2.8; do + wrapProgram $out/bin/$each \ + --set GIMP2_PLUGINDIR "$out/lib/gimp/2.0" \ + ${toString extraArgs} + done + set +x + for each in gimp gimp-console; do + ln -sf "$each-2.8" $out/bin/$each + done + ''; + }; +in stdenv.lib.overrideDerivation drv (x : { buildInputs = x.buildInputs ++ [ makeWrapper ]; }) diff --git a/pkgs/applications/graphics/glabels/default.nix b/pkgs/applications/graphics/glabels/default.nix new file mode 100644 index 000000000000..cf1ab1942e58 --- /dev/null +++ b/pkgs/applications/graphics/glabels/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchFromGitHub, autoconf, automake, barcode, gnome3 +, gtk3, gtk_doc, libxml2, librsvg , libtool, libe-book +, intltool, itstool, makeWrapper, pkgconfig, which +}: + +stdenv.mkDerivation rec { + name = "glabels-${version}"; + version = "3.2.1"; + src = fetchFromGitHub { + owner = "jimevins"; + repo = "glabels"; + rev = "glabels-3_2_1"; + sha256 = "1y6gz0v9si3cvdzhakbgkyc94fajg19rmykfgnc37alrc21vs9zg"; + }; + + buildInputs = [ + autoconf automake barcode gtk3 gtk_doc gnome3.yelp_tools + gnome3.gnome_common gnome3.gsettings_desktop_schemas + intltool itstool libxml2 librsvg libe-book libtool + makeWrapper pkgconfig + ]; + + preFixup = '' + rm "$out/share/icons/hicolor/icon-theme.cache" + wrapProgram "$out/bin/glabels-3" \ + --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" + ''; + + preConfigure = "./autogen.sh"; + + meta = { + description = "Create labels and business cards"; + homepage = http://glabels.org/; + license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.unix; + maintainers = [ stdenv.lib.maintainers.nico202 ]; + }; +} diff --git a/pkgs/applications/graphics/hugin/default.nix b/pkgs/applications/graphics/hugin/default.nix index b11ed1a99df7..97181cb0d1bf 100644 --- a/pkgs/applications/graphics/hugin/default.nix +++ b/pkgs/applications/graphics/hugin/default.nix @@ -1,23 +1,25 @@ -{ stdenv, cmake, fetchurl, gnumake, pkgconfig +{ stdenv, cmake, fetchurl, gnumake, pkgconfig, makeWrapper , boost, gettext, tclap, wxGTK , freeglut, glew, libXi, libXmu, mesa -, autopanosiftc, enblend-enfuse, exiv2, ilmbase, lensfun, libpng, libtiff -, openexr, panotools, perlPackages +, autopanosiftc, enblend-enfuse, exiv2, fftw, ilmbase, lensfun, libpng, libtiff +, openexr, panotools, perlPackages, sqlite, vigra }: stdenv.mkDerivation rec { - name = "hugin-2013.0.0"; + name = "hugin-2015.0.0"; src = fetchurl { url = "mirror://sourceforge/hugin/${name}.tar.bz2"; - sha256 = "1mgbvg09xvf0zcm9jfv5lb65nd292l86ffa23yp4pzm6izaiwkj8"; + sha256 = "1gfblax9rxay8xskz5r8bips4nfh70vkyrb8ksgl6pg91c8krn9c"; }; NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR"; buildInputs = [ boost gettext tclap wxGTK freeglut glew libXi libXmu mesa - exiv2 ilmbase lensfun libtiff libpng openexr panotools + exiv2 fftw ilmbase lensfun libtiff libpng openexr panotools + sqlite vigra + perlPackages.ImageExifTool makeWrapper ]; # disable installation of the python scripting interface @@ -27,22 +29,21 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - # commandline tools needed by the hugin batch processor - # you may have to tell hugin (in the preferences) where these binaries reside - propagatedUserEnvPackages = [ autopanosiftc enblend-enfuse gnumake - perlPackages.ImageExifTool - ]; - postInstall = '' - mkdir -p "$out/nix-support" - echo $propagatedUserEnvPackages > $out/nix-support/propagated-user-env-packages + for p in $out/bin/*; do + wrapProgram "$p" \ + --suffix PATH : ${autopanosiftc}/bin \ + --suffix PATH : ${enblend-enfuse}/bin \ + --suffix PATH : ${gnumake}/bin \ + --suffix PATH : ${perlPackages.ImageExifTool}/bin + done ''; meta = { homepage = http://hugin.sourceforge.net/; description = "Toolkit for stitching photographs and assembling panoramas, together with an easy to use graphical front end"; license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [viric]; + maintainers = with stdenv.lib.maintainers; [ viric hrdinka ]; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix index 409fd0a767ce..3704ea2f9c41 100644 --- a/pkgs/applications/graphics/inkscape/default.nix +++ b/pkgs/applications/graphics/inkscape/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, perl, perlXMLParser, gtk, libXft , libpng, zlib, popt, boehmgc, libxml2, libxslt, glib, gtkmm , glibmm, libsigcxx, lcms, boost, gettext, makeWrapper, intltool -, gsl, python, pyxml, lxml, poppler, imagemagick, libwpg, librevenge +, gsl, python, numpy, pyxml, lxml, poppler, imagemagick, libwpg, librevenge , libvisio, libcdr, libexif, unzip , boxMakerPlugin ? false # boxmaker plugin }: @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ # Python is used at run-time to execute scripts, e.g., those from # the "Effects" menu. - python pyxml lxml + python pyxml numpy lxml ]; buildInputs = [ @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { for i in "$out/bin/"* do wrapProgram "$i" --prefix PYTHONPATH : \ - "$(toPythonPath ${pyxml}):$(toPythonPath ${lxml})" \ + "$(toPythonPath ${pyxml}):$(toPythonPath ${lxml}):$(toPythonPath ${numpy})" \ --prefix PATH : ${python}/bin || \ exit 2 done diff --git a/pkgs/applications/graphics/jbrout/default.nix b/pkgs/applications/graphics/jbrout/default.nix index e37c2c283e47..8d6c15129cb3 100644 --- a/pkgs/applications/graphics/jbrout/default.nix +++ b/pkgs/applications/graphics/jbrout/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchsvn, buildPythonPackage, python, pyGtkGlade, makeWrapper, pyexiv2, pythonPackages, fbida, which }: +{ stdenv, fetchsvn, buildPythonApplication, python, pyGtkGlade, makeWrapper, pyexiv2, pythonPackages, fbida, which }: -buildPythonPackage rec { +buildPythonApplication rec { name = "jbrout-${version}"; version = "338"; diff --git a/pkgs/applications/graphics/mcomix/default.nix b/pkgs/applications/graphics/mcomix/default.nix index 069a4bace286..39d17a32eec3 100644 --- a/pkgs/applications/graphics/mcomix/default.nix +++ b/pkgs/applications/graphics/mcomix/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, buildPythonPackage, python27Packages }: +{ stdenv, fetchurl, buildPythonApplication, python27Packages }: -buildPythonPackage rec { +buildPythonApplication rec { namePrefix = ""; name = "mcomix-1.01"; diff --git a/pkgs/applications/graphics/mirage/default.nix b/pkgs/applications/graphics/mirage/default.nix index c4b14388d1ba..c3f06544bb4a 100644 --- a/pkgs/applications/graphics/mirage/default.nix +++ b/pkgs/applications/graphics/mirage/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, buildPythonPackage, python, pygtk, pillow, libX11, gettext }: +{ stdenv, fetchurl, buildPythonApplication, python, pygtk, pillow, libX11, gettext }: -buildPythonPackage rec { +buildPythonApplication rec { namePrefix = ""; name = "mirage-0.9.5.2"; diff --git a/pkgs/applications/graphics/sane/backends/git.nix b/pkgs/applications/graphics/sane/backends/git.nix index bb5e787ede66..84e1f783e2a3 100644 --- a/pkgs/applications/graphics/sane/backends/git.nix +++ b/pkgs/applications/graphics/sane/backends/git.nix @@ -1,10 +1,10 @@ { callPackage, fetchgit, ... } @ args: callPackage ./generic.nix (args // { - version = "2016-01-25"; + version = "2016-03-05"; src = fetchgit { - sha256 = "db1fecd671bd8b3a777138bb4815285b4364ee3ad01ab05424b4aa0c20ed9919"; - rev = "056f590f2d147099554d97a89dd5e0ddfa8d6dda"; + sha256 = "dc84530d5e0233427acfd132aa08a4cf9973c936ff72a66ee08ecf836200d367"; + rev = "23eb95582da718791103b83ea002e947caa0f5fc"; url = "git://alioth.debian.org/git/sane/sane-backends.git"; }; }) diff --git a/pkgs/applications/graphics/simple-scan/default.nix b/pkgs/applications/graphics/simple-scan/default.nix index 5f8a8ac6b9ae..7ee298f72811 100644 --- a/pkgs/applications/graphics/simple-scan/default.nix +++ b/pkgs/applications/graphics/simple-scan/default.nix @@ -3,10 +3,10 @@ stdenv.mkDerivation rec { name = "simple-scan-${version}"; - version = "3.19.4"; + version = "3.19.91"; src = fetchurl { - sha256 = "1v9sify1s38qd5sfg26m7sdg9bkrfmai2nijs4wzah7xa9p23c83"; + sha256 = "1c5glf5vxgld41w4jxfqcv17q76qnh43fawpv33hncgh8d283xkf"; url = "https://launchpad.net/simple-scan/3.19/${version}/+download/${name}.tar.xz"; }; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-packagekit" ]; preBuild = '' - # Clean up stale generated .c files still referencing packagekit headers: + # Clean up stale .c files referencing packagekit headers as of 3.19.91: make clean ''; diff --git a/pkgs/applications/graphics/xara/default.nix b/pkgs/applications/graphics/xara/default.nix index cd3a09887d0f..cc456465ba63 100644 --- a/pkgs/applications/graphics/xara/default.nix +++ b/pkgs/applications/graphics/xara/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { url = http://downloads2.xara.com/opensource/XaraLX-0.7r1785.tar.bz2; sha256 = "05xbzq1i1vw2mdsv7zjqfpxfv3g1j0g5kks0gq6sh373xd6y8lyh"; }; - + nativeBuildInputs = [ automake pkgconfig gettext perl zip ]; buildInputs = [ wxGTK gtk libxml2 freetype pango ]; @@ -17,4 +17,6 @@ stdenv.mkDerivation { patches = map fetchurl (import ./debian-patches.nix); prePatch = "patchShebangs Scripts"; + + meta.broken = true; } |