diff options
Diffstat (limited to 'pkgs/applications/graphics')
-rw-r--r-- | pkgs/applications/graphics/djview/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/graphics/fbida/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/graphics/gimp/2.8.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/graphics/jpegoptim/default.nix | 24 | ||||
-rw-r--r-- | pkgs/applications/graphics/mozjpeg/default.nix | 31 | ||||
-rw-r--r-- | pkgs/applications/graphics/sane/backends/git.nix | 6 | ||||
-rw-r--r-- | pkgs/applications/graphics/sane/frontends.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/graphics/sane/xsane.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/graphics/shotwell/default.nix | 8 | ||||
-rw-r--r-- | pkgs/applications/graphics/simple-scan/default.nix | 8 | ||||
-rw-r--r-- | pkgs/applications/graphics/solvespace/default.nix | 20 | ||||
-rw-r--r-- | pkgs/applications/graphics/sxiv/default.nix | 18 | ||||
-rw-r--r-- | pkgs/applications/graphics/ufraw/default.nix | 8 | ||||
-rw-r--r-- | pkgs/applications/graphics/xzgv/default.nix | 27 | ||||
-rw-r--r-- | pkgs/applications/graphics/xzgv/fix-linker-paths.patch | 25 |
15 files changed, 146 insertions, 49 deletions
diff --git a/pkgs/applications/graphics/djview/default.nix b/pkgs/applications/graphics/djview/default.nix index e5c49846b23c..2276b868b59a 100644 --- a/pkgs/applications/graphics/djview/default.nix +++ b/pkgs/applications/graphics/djview/default.nix @@ -5,10 +5,10 @@ let # TODO: qt = qt5.base; # should work but there's a mysterious "-silent" error in stdenv.mkDerivation rec { - name = "djview-4.10.3"; + name = "djview-4.10.5"; src = fetchurl { url = "mirror://sourceforge/djvu/${name}.tar.gz"; - sha256 = "09dbws0k8giizc0xqpad8plbyaply8x1pjc2k3207v2svk6hxf2h"; + sha256 = "0gbvbly7w3cr8wgpyh76nf9w7cf7740vp7k5hccks186f6005cx0"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/graphics/fbida/default.nix b/pkgs/applications/graphics/fbida/default.nix index bacfa500ede1..b0ad5be93717 100644 --- a/pkgs/applications/graphics/fbida/default.nix +++ b/pkgs/applications/graphics/fbida/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, libjpeg, libexif, libungif, libtiff, libpng, libwebp -, pkgconfig, freetype, fontconfig, which, imagemagick, curl, saneBackends +, pkgconfig, freetype, fontconfig, which, imagemagick, curl, sane-backends }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig which ]; buildInputs = [ libexif libjpeg libpng libungif freetype fontconfig libtiff libwebp - imagemagick curl saneBackends + imagemagick curl sane-backends ]; makeFlags = [ "prefix=$(out)" "verbose=yes" ]; diff --git a/pkgs/applications/graphics/gimp/2.8.nix b/pkgs/applications/graphics/gimp/2.8.nix index 7c394ae11c6f..954a1d4c19c9 100644 --- a/pkgs/applications/graphics/gimp/2.8.nix +++ b/pkgs/applications/graphics/gimp/2.8.nix @@ -4,11 +4,11 @@ , python, pygtk, libart_lgpl, libexif, gettext, xorg, wrapPython }: stdenv.mkDerivation rec { - name = "gimp-2.8.14"; + name = "gimp-2.8.16"; src = fetchurl { url = "http://download.gimp.org/pub/gimp/v2.8/${name}.tar.bz2"; - sha256 = "d82a958641c9c752d68e35f65840925c08e314cea90222ad845892a40e05b22d"; + sha256 = "1dsgazia9hmab8cw3iis7s69dvqyfj5wga7ds7w2q5mms1xqbqwm"; }; buildInputs = diff --git a/pkgs/applications/graphics/jpegoptim/default.nix b/pkgs/applications/graphics/jpegoptim/default.nix new file mode 100644 index 000000000000..5bb577011e71 --- /dev/null +++ b/pkgs/applications/graphics/jpegoptim/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, libjpeg }: + +stdenv.mkDerivation rec { + version = "1.4.3"; + name = "jpegoptim-${version}"; + + src = fetchurl { + url = "http://www.kokkonen.net/tjko/src/${name}.tar.gz"; + sha256 = "0k53q7dc8w5ashz8v261x2b5vvz7gdvg8w962rz9gjvkjbh4lg93"; + }; + + # There are no checks, it seems. + doCheck = false; + + buildInputs = [ libjpeg ]; + + meta = { + description = "Optimize JPEG files"; + homepage = http://www.kokkonen.net/tjko/projects.html ; + license = stdenv.lib.licenses.gpl2; + maintainers = [ stdenv.lib.maintainers.aristid ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/applications/graphics/mozjpeg/default.nix b/pkgs/applications/graphics/mozjpeg/default.nix new file mode 100644 index 000000000000..1b082de98bc7 --- /dev/null +++ b/pkgs/applications/graphics/mozjpeg/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchurl, file, pkgconfig, libpng, nasm }: + +stdenv.mkDerivation rec { + version = "3.1"; + name = "mozjpeg-${version}"; + + src = fetchurl { + url = "https://github.com/mozilla/mozjpeg/releases/download/v${version}/mozjpeg-${version}-release-source.tar.gz"; + sha256 = "07vs0xq9di7bv3y68daig8dvxvjqrn8a5na702gj3nn58a1xivfy"; + }; + + postPatch = '' + sed -i -e "s!/usr/bin/file!${file}/bin/file!g" configure + ''; + + buildInputs = [ libpng pkgconfig nasm ]; + + meta = { + description = "Mozilla JPEG Encoder Project"; + longDescription = '' + This project's goal is to reduce the size of JPEG files without reducing quality or compatibility with the + vast majority of the world's deployed decoders. + + The idea is to reduce transfer times for JPEGs on the Web, thus reducing page load times. + ''; + homepage = https://github.com/mozilla/mozjpeg ; + license = stdenv.lib.licenses.bsd3; + maintainers = [ stdenv.lib.maintainers.aristid ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/applications/graphics/sane/backends/git.nix b/pkgs/applications/graphics/sane/backends/git.nix index 6c6838daef17..1b1ccf4e5892 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 = "2015-12-27"; + version = "2016-01-09"; src = fetchgit { - sha256 = "4bf6e8815d2edbbc75255928d0fb030639a9fea9a5aa953dcf1f00e167eff527"; - rev = "cadb4b0fff00540159625320416e5601c4704627"; + sha256 = "440f88a4126841cfd139b17902ceb940bbf189defe21b208e93bfd474cfb16e8"; + rev = "f78e85cad666492fadd5612af77fa7c84e270a12"; url = "git://alioth.debian.org/git/sane/sane-backends.git"; }; }) diff --git a/pkgs/applications/graphics/sane/frontends.nix b/pkgs/applications/graphics/sane/frontends.nix index a0f6e5bac509..d7b066220559 100644 --- a/pkgs/applications/graphics/sane/frontends.nix +++ b/pkgs/applications/graphics/sane/frontends.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, saneBackends, libX11, gtk, pkgconfig, libusb ? null}: +{ stdenv, fetchurl, sane-backends, libX11, gtk, pkgconfig, libusb ? null}: stdenv.mkDerivation rec { name = "sane-frontends-1.0.14"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sed -e '/SANE_CAP_ALWAYS_SETTABLE/d' -i src/gtkglue.c ''; - buildInputs = [saneBackends libX11 gtk pkgconfig] ++ + buildInputs = [sane-backends libX11 gtk pkgconfig] ++ (if libusb != null then [libusb] else []); meta = { diff --git a/pkgs/applications/graphics/sane/xsane.nix b/pkgs/applications/graphics/sane/xsane.nix index 9bca047a7cf1..751f31f73f29 100644 --- a/pkgs/applications/graphics/sane/xsane.nix +++ b/pkgs/applications/graphics/sane/xsane.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, saneBackends, saneFrontends, libX11, gtk, pkgconfig, libpng +{ stdenv, fetchurl, sane-backends, sane-frontends, libX11, gtk, pkgconfig, libpng , libusb ? null , gimpSupport ? false, gimp_2_8 ? null }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { chmod a+rX -R . ''; - buildInputs = [libpng saneBackends saneFrontends libX11 gtk pkgconfig ] + buildInputs = [libpng sane-backends sane-frontends libX11 gtk pkgconfig ] ++ (if libusb != null then [libusb] else []) ++ stdenv.lib.optional gimpSupport gimp_2_8; diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix index 5e5371166eee..3238a3ba974d 100644 --- a/pkgs/applications/graphics/shotwell/default.nix +++ b/pkgs/applications/graphics/shotwell/default.nix @@ -6,12 +6,12 @@ # for dependencies see http://www.yorba.org/projects/shotwell/install/ stdenv.mkDerivation rec { - version = "0.20.2"; + version = "0.22.0"; name = "shotwell-${version}"; src = fetchurl { - url = "mirror://gnome/sources/shotwell/0.20/${name}.tar.xz"; - sha256 = "0h5pdczsrkplvlvq54zk3am4kjmfpd6pn2sz0ky8lfq1fngwiqip"; + url = "mirror://gnome/sources/shotwell/0.22/${name}.tar.xz"; + sha256 = "0cgqaaikrb10plhf6zxbgqy32zqpiwyi9dpx3g8yr261q72r5c81"; }; NIX_CFLAGS_COMPILE = "-I${glib}/include/glib-2.0 -I${glib}/lib/glib-2.0/include"; @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Popular photo organizer for the GNOME desktop"; - homepage = http://www.yorba.org/projects/shotwell/; + homepage = https://wiki.gnome.org/Apps/Shotwell; license = licenses.lgpl21Plus; maintainers = with maintainers; [iElectric]; platforms = platforms.linux; diff --git a/pkgs/applications/graphics/simple-scan/default.nix b/pkgs/applications/graphics/simple-scan/default.nix index c169d262fb63..a2b7fd77337b 100644 --- a/pkgs/applications/graphics/simple-scan/default.nix +++ b/pkgs/applications/graphics/simple-scan/default.nix @@ -1,16 +1,16 @@ { stdenv, fetchurl, cairo, colord, glib, gtk3, gusb, intltool, itstool -, libusb1, libxml2, pkgconfig, saneBackends, vala, wrapGAppsHook }: +, libusb1, libxml2, pkgconfig, sane-backends, vala, wrapGAppsHook }: -let version = "3.19.3"; in +let version = "3.19.4"; in stdenv.mkDerivation rec { name = "simple-scan-${version}"; src = fetchurl { - sha256 = "0il7ikd5hj9mgzrivm01g572g9101w8la58h3hjyakwcfw3jp976"; + sha256 = "1v9sify1s38qd5sfg26m7sdg9bkrfmai2nijs4wzah7xa9p23c83"; url = "https://launchpad.net/simple-scan/3.19/${version}/+download/${name}.tar.xz"; }; - buildInputs = [ cairo colord glib gusb gtk3 libusb1 libxml2 saneBackends + buildInputs = [ cairo colord glib gusb gtk3 libusb1 libxml2 sane-backends vala ]; nativeBuildInputs = [ intltool itstool pkgconfig wrapGAppsHook ]; diff --git a/pkgs/applications/graphics/solvespace/default.nix b/pkgs/applications/graphics/solvespace/default.nix index 67513bcf9230..069eea3b521b 100644 --- a/pkgs/applications/graphics/solvespace/default.nix +++ b/pkgs/applications/graphics/solvespace/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchgit,autoconf, automake, gcc, fltk13 -, libjpeg, libpng, libtool, mesa, pkgconfig }: +{ stdenv, fetchgit, autoreconfHook, fltk13 +, libjpeg, libpng, mesa, pkgconfig }: stdenv.mkDerivation { name = "solvespace-2.0"; @@ -14,27 +14,15 @@ stdenv.mkDerivation { dontBuild = true; enableParallelBuilding = false; - buildInputs = [ - autoconf - automake - gcc + buildInputs = [ + autoreconfHook fltk13 libjpeg libpng - libtool mesa pkgconfig - stdenv ]; - preConfigure = '' - aclocal - libtoolize - - autoreconf -i - automake --add-missing - ''; - meta = { description = "A parametric 3d CAD program"; license = stdenv.lib.licenses.gpl3; diff --git a/pkgs/applications/graphics/sxiv/default.nix b/pkgs/applications/graphics/sxiv/default.nix index 45813bbdb204..fe8911273ded 100644 --- a/pkgs/applications/graphics/sxiv/default.nix +++ b/pkgs/applications/graphics/sxiv/default.nix @@ -1,12 +1,14 @@ -{ stdenv, fetchgit, libX11, imlib2, giflib, libexif }: +{ stdenv, fetchFromGitHub, libX11, imlib2, giflib, libexif }: -stdenv.mkDerivation { - name = "sxiv-2015.03.25"; - - src = fetchgit { - url = "https://github.com/muennich/sxiv.git"; - rev = "01ed483b50f506fcba928af43e2ca017897e7c77"; - sha256 = "18s64l3dvibqg9biznzy4mdkkn9qmmpqxpdx7ljx7c0832aqy94k"; +stdenv.mkDerivation rec { + name = "sxiv-${version}"; + version = "v1.3.2"; + #https://github.com/muennich/sxiv/archive/v1.3.2.zip + src = fetchFromGitHub { + owner = "muennich"; + repo = "sxiv"; + rev = version; + sha256 = "1f4gz1qjhb44bbb3q5fqk439zyipkwnr19zhg89yq2pgmzzzqr2h"; }; postUnpack = '' diff --git a/pkgs/applications/graphics/ufraw/default.nix b/pkgs/applications/graphics/ufraw/default.nix index 3de3d6cdd5a9..23a37ab43ae6 100644 --- a/pkgs/applications/graphics/ufraw/default.nix +++ b/pkgs/applications/graphics/ufraw/default.nix @@ -1,18 +1,18 @@ { fetchurl, stdenv, pkgconfig, gtk, gettext, bzip2, zlib -, libjpeg, libtiff, cfitsio, exiv2, lcms, gtkimageview, lensfun }: +, libjpeg, libtiff, cfitsio, exiv2, lcms2, gtkimageview, lensfun }: stdenv.mkDerivation rec { - name = "ufraw-0.20"; + name = "ufraw-0.22"; src = fetchurl { # XXX: These guys appear to mutate uploaded tarballs! url = "mirror://sourceforge/ufraw/${name}.tar.gz"; - sha256 = "1q51p0ynzayxwfpilj0s38aapgkfga00gbl7xi0ndx9q6bvk1kbd"; + sha256 = "0pm216pg0vr44gwz9vcvq3fsf8r5iayljhf5nis2mnw7wn6d5azp"; }; buildInputs = [ pkgconfig gtk gtkimageview gettext bzip2 zlib - libjpeg libtiff cfitsio exiv2 lcms lensfun + libjpeg libtiff cfitsio exiv2 lcms2 lensfun ]; meta = { diff --git a/pkgs/applications/graphics/xzgv/default.nix b/pkgs/applications/graphics/xzgv/default.nix new file mode 100644 index 000000000000..053e1137e391 --- /dev/null +++ b/pkgs/applications/graphics/xzgv/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchurl, gtk, pkgconfig, texinfo }: + +stdenv.mkDerivation rec { + name = "xzgv-${version}"; + version = "0.9.1"; + src = fetchurl { + url = "mirror://sourceforge/xzgv/xzgv-${version}.tar.gz"; + sha256 = "1rh432wnvzs434knzbda0fslhfx0gngryrrnqkfm6gwd2g5mxcph"; + }; + buildInputs = [ gtk pkgconfig texinfo ]; + patches = [ ./fix-linker-paths.patch ]; + postPatch = '' + substituteInPlace config.mk \ + --replace /usr/local $out + substituteInPlace config.mk \ + --replace "CFLAGS=-O2 -Wall" "CFLAGS=-Wall" + substituteInPlace Makefile \ + --replace "all: src man" "all: src man info" + ''; + meta = with stdenv.lib; { + homepage = http://sourceforge.net/projects/xzgv/; + description = "Picture viewer for X with a thumbnail-based selector"; + license = licenses.gpl2; + maintainers = [ maintainers.womfoo ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/graphics/xzgv/fix-linker-paths.patch b/pkgs/applications/graphics/xzgv/fix-linker-paths.patch new file mode 100644 index 000000000000..c5b1ae0879b5 --- /dev/null +++ b/pkgs/applications/graphics/xzgv/fix-linker-paths.patch @@ -0,0 +1,25 @@ +taken from http://sourceforge.net/p/xzgv/code/53/tree//trunk/xzgv/src/Makefile?diff=514dada434309d2ec11f5eff:52 +--- a/src/Makefile ++++ b/src/Makefile +@@ -9,8 +9,10 @@ + # This gets definitions for CC, CFLAGS, BINDIR etc. + include ../config.mk + +-CFLAGS+=`pkg-config --cflags gtk+-2.0` `pkg-config --cflags gdk-pixbuf-2.0` +-LDFLAGS+=`pkg-config --libs gtk+-2.0` `pkg-config --libs gdk-pixbuf-2.0` ++CFLAGS+=`pkg-config --cflags gtk+-2.0` `pkg-config --cflags gdk-pixbuf-2.0` \ ++ `pkg-config --cflags x11` ++LDFLAGS+=`pkg-config --libs gtk+-2.0` `pkg-config --libs gdk-pixbuf-2.0` \ ++ `pkg-config --libs x11` -lm + + all: xzgv + +@@ -23,7 +25,7 @@ + backend.o + + xzgv: $(OBJS) +- $(CC) $(LDFLAGS) -o xzgv $(OBJS) ++ $(CC) -o xzgv $(OBJS) $(LDFLAGS) + + installdirs: + /bin/sh ../mkinstalldirs $(BINDIR) |