diff options
Diffstat (limited to 'pkgs/applications/graphics')
10 files changed, 24 insertions, 33 deletions
diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index c25cc11c203..8fa86041414 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -15,7 +15,11 @@ stdenv.mkDerivation rec { version = "6.9.2-0"; src = fetchurl { - url = "mirror://imagemagick/releases/ImageMagick-${version}.tar.xz"; + urls = [ + "mirror://imagemagick/releases/ImageMagick-${version}.tar.xz" + # the original source above removes tarballs quickly + "http://distfiles.macports.org/ImageMagick/ImageMagick-${version}.tar.xz" + ]; sha256 = "17ir8bw1j7g7srqmsz3rx780sgnc21zfn0kwyj78iazrywldx8h7"; }; diff --git a/pkgs/applications/graphics/apitrace/default.nix b/pkgs/applications/graphics/apitrace/default.nix index 072cc698e92..f54628e0b8d 100644 --- a/pkgs/applications/graphics/apitrace/default.nix +++ b/pkgs/applications/graphics/apitrace/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchFromGitHub, cmake, libX11, procps, python, qtbase }: -let version = "7.1"; in -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "apitrace-${version}"; + version = "7.1"; src = fetchFromGitHub { sha256 = "1n2gmsjnpyam7isg7n1ksggyh6y1l8drvx0a93bnvbcskr7jiz9a"; @@ -20,7 +20,6 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - inherit version; homepage = https://apitrace.github.io; description = "Tools to trace OpenGL, OpenGL ES, Direct3D, and DirectDraw APIs"; license = licenses.mit; diff --git a/pkgs/applications/graphics/gimp/2.8.nix b/pkgs/applications/graphics/gimp/2.8.nix index 82c4bcbdc36..1184a498c66 100644 --- a/pkgs/applications/graphics/gimp/2.8.nix +++ b/pkgs/applications/graphics/gimp/2.8.nix @@ -27,6 +27,8 @@ stdenv.mkDerivation rec { #configureFlags = [ "--disable-print" ]; + enableParallelBuilding = true; + # "screenshot" needs this. NIX_LDFLAGS = "-rpath ${xorg.libX11.out}/lib" + stdenv.lib.optionalString stdenv.isDarwin " -lintl"; diff --git a/pkgs/applications/graphics/inkscape/configure-python-libs.patch b/pkgs/applications/graphics/inkscape/configure-python-libs.patch deleted file mode 100644 index c79006d3320..00000000000 --- a/pkgs/applications/graphics/inkscape/configure-python-libs.patch +++ /dev/null @@ -1,15 +0,0 @@ -Work around Python misdetection and set `PYTHON_LIBS' to -"-L/nix/store/... -lpython2.4" instead of "/nix/store/.../libpython2.4.so". -Changed to 2.5. - ---- inkscape-0.45.1/configure 2007-03-20 14:56:43.000000000 +0100 -+++ inkscape-0.45.1/configure 2008-02-22 16:19:10.000000000 +0100 -@@ -10202,7 +10202,7 @@ if test "x$with_python" = "xyes"; then - if test "$?" -gt "0"; then - with_python="no" - else -- checkPYTHON_LIBS=`python -c "import distutils.sysconfig ; print '%s/%s %s' % (distutils.sysconfig.get_config_var('LIBPL'),distutils.sysconfig.get_config_var('LDLIBRARY'),distutils.sysconfig.get_config_var('LIBS'))" 2>/dev/null` -+ checkPYTHON_LIBS=`python -c "import distutils.sysconfig ; print '-L%s -lpython2.5 %s' % (distutils.sysconfig.get_config_var('LIBDIR'),distutils.sysconfig.get_config_var('LIBS'))" 2>/dev/null` - if test "$?" -gt "0"; then - with_python="no" - else diff --git a/pkgs/applications/graphics/openimageio/default.nix b/pkgs/applications/graphics/openimageio/default.nix index 6bffa834ae0..97607e81951 100644 --- a/pkgs/applications/graphics/openimageio/default.nix +++ b/pkgs/applications/graphics/openimageio/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "openimageio-${version}"; - version = "1.4.16"; + version = "1.6.9"; src = fetchurl { url = "https://github.com/OpenImageIO/oiio/archive/Release-${version}.zip"; - sha256 = "0f9gspsjhniz992c04dm4lvffzz7zjqn1n34nqn6c32r498kimcj"; + sha256 = "0942xj877875f4dpfg7aqwyw015y82vkhaqap7yhybmvzsfj7wki"; }; buildInputs = [ diff --git a/pkgs/applications/graphics/photoqt/default.nix b/pkgs/applications/graphics/photoqt/default.nix index c96b0c182a6..9d68a44821a 100644 --- a/pkgs/applications/graphics/photoqt/default.nix +++ b/pkgs/applications/graphics/photoqt/default.nix @@ -17,7 +17,9 @@ stdenv.mkDerivation rec { sha256 = "0j2kvxfb5pd9abciv161nkcsyam6n8kfqs8ymwj2mxiqflwbmfl1"; }; - buildInputs = [ cmake makeWrapper qtbase qttools exiv2 graphicsmagick ]; + buildInputs = [ + cmake makeWrapper qtbase qtquickcontrols qttools exiv2 graphicsmagick + ]; preConfigure = '' export MAGICK_LOCATION="${graphicsmagick}/include/GraphicsMagick" diff --git a/pkgs/applications/graphics/sane/backends/generic.nix b/pkgs/applications/graphics/sane/backends/generic.nix index e98774a4368..8f46e647252 100644 --- a/pkgs/applications/graphics/sane/backends/generic.nix +++ b/pkgs/applications/graphics/sane/backends/generic.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl -, avahi, libusb1, libv4l, net_snmp +, avahi, libjpeg, libusb1, libv4l, net_snmp , gettext, pkgconfig # List of { src name backend } attibute sets - see installFirmware below: @@ -13,7 +13,7 @@ }: stdenv.mkDerivation { - inherit src; + inherit src version; name = "sane-backends-${version}"; @@ -50,11 +50,12 @@ stdenv.mkDerivation { mkdir -p $out/etc/udev/rules.d/ ./tools/sane-desc -m udev > $out/etc/udev/rules.d/49-libsane.rules || \ cp tools/udev/libsane.rules $out/etc/udev/rules.d/49-libsane.rules + + substituteInPlace $out/lib/libsane.la \ + --replace "-ljpeg" "-L${libjpeg}/lib -ljpeg" '' + stdenv.lib.concatStrings (builtins.map installFirmware compatFirmware); meta = with stdenv.lib; { - inherit version; - description = "SANE (Scanner Access Now Easy) backends"; longDescription = '' Collection of open-source SANE backends (device drivers). diff --git a/pkgs/applications/graphics/sane/backends/git.nix b/pkgs/applications/graphics/sane/backends/git.nix index 1b1ccf4e589..bb5e787ede6 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-09"; + version = "2016-01-25"; src = fetchgit { - sha256 = "440f88a4126841cfd139b17902ceb940bbf189defe21b208e93bfd474cfb16e8"; - rev = "f78e85cad666492fadd5612af77fa7c84e270a12"; + sha256 = "db1fecd671bd8b3a777138bb4815285b4364ee3ad01ab05424b4aa0c20ed9919"; + rev = "056f590f2d147099554d97a89dd5e0ddfa8d6dda"; 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 a2b7fd77337..5f8a8ac6b9a 100644 --- a/pkgs/applications/graphics/simple-scan/default.nix +++ b/pkgs/applications/graphics/simple-scan/default.nix @@ -1,9 +1,9 @@ { stdenv, fetchurl, cairo, colord, glib, gtk3, gusb, intltool, itstool , libusb1, libxml2, pkgconfig, sane-backends, vala, wrapGAppsHook }: -let version = "3.19.4"; in stdenv.mkDerivation rec { name = "simple-scan-${version}"; + version = "3.19.4"; src = fetchurl { sha256 = "1v9sify1s38qd5sfg26m7sdg9bkrfmai2nijs4wzah7xa9p23c83"; @@ -26,7 +26,6 @@ stdenv.mkDerivation rec { doCheck = true; meta = with stdenv.lib; { - inherit version; description = "Simple scanning utility"; longDescription = '' A really easy way to scan both documents and photos. You can crop out the diff --git a/pkgs/applications/graphics/swingsane/default.nix b/pkgs/applications/graphics/swingsane/default.nix index 0f85bf58c55..53bdbcd1274 100644 --- a/pkgs/applications/graphics/swingsane/default.nix +++ b/pkgs/applications/graphics/swingsane/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchurl, makeDesktopItem, unzip, jre }: -let version = "0.2"; in stdenv.mkDerivation rec { name = "swingsane-${version}"; + version = "0.2"; src = fetchurl { sha256 = "15pgqgyw46yd2i367ax9940pfyvinyw2m8apmwhrn0ix5nywa7ni"; @@ -44,7 +44,6 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - inherit version; description = "Java GUI for SANE scanner servers (saned)"; longDescription = '' SwingSane is a powerful, cross platform, open source Java front-end for |