From f040a1443ea314692800b0370f7ad90614aeb7e0 Mon Sep 17 00:00:00 2001 From: Eduard Bachmakov Date: Wed, 9 Sep 2015 18:59:05 -0400 Subject: [PATCH 1/2] graphicsmagick: 1.3.18 -> 1.3.21 --- pkgs/applications/graphics/graphicsmagick/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/graphicsmagick/default.nix b/pkgs/applications/graphics/graphicsmagick/default.nix index 536249e70a6..95cfcaef01a 100644 --- a/pkgs/applications/graphics/graphicsmagick/default.nix +++ b/pkgs/applications/graphics/graphicsmagick/default.nix @@ -2,14 +2,14 @@ , libjpeg, libpng, libtiff, libxml2, zlib, libtool, xz , libX11, quantumdepth ? 8}: -let version = "1.3.18"; in +let version = "1.3.21"; in stdenv.mkDerivation { name = "graphicsmagick-${version}"; src = fetchurl { url = "mirror://sourceforge/graphicsmagick/GraphicsMagick-${version}.tar.xz"; - sha256 = "1axh4j2jr3l92dan15b2nmx9da4l7i0rcz9b5bvfd4q742zfwj7x"; + sha256 = "07rwpxy62r9m4r2cg6yll2nr698mxyvbji8vgsivcxhpk56k0ich"; }; configureFlags = "--enable-shared --with-quantum-depth=" + toString quantumdepth; From 09bf6c95c6174ed708eca6806dd3e1dbb3cc154a Mon Sep 17 00:00:00 2001 From: Eduard Bachmakov Date: Wed, 9 Sep 2015 19:00:51 -0400 Subject: [PATCH 2/2] photoqt: 1.2 -> 1.3 --- pkgs/applications/graphics/photoqt/default.nix | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/graphics/photoqt/default.nix b/pkgs/applications/graphics/photoqt/default.nix index 2d41cfe5189..7ae6d6e050f 100644 --- a/pkgs/applications/graphics/photoqt/default.nix +++ b/pkgs/applications/graphics/photoqt/default.nix @@ -1,21 +1,30 @@ -{ stdenv, fetchurl, cmake, qt5, exiv2, graphicsmagick }: +{ stdenv, fetchurl, cmake, makeWrapper, qt5, exiv2, graphicsmagick }: let - version = "1.2"; + version = "1.3"; + qmlPath = stdenv.lib.makeSearchPath "lib/qt5/qml/" [ + qt5.quickcontrols + qt5.declarative + qt5.multimedia + ]; in stdenv.mkDerivation rec { name = "photoqt-${version}"; src = fetchurl { url = "http://photoqt.org/pkgs/photoqt-${version}.tar.gz"; - sha256 = "1dnnj2h3j517hcbjxlzk035fis44wdmqq7dvhwpmq1rcr0v32aaa"; + sha256 = "0j2kvxfb5pd9abciv161nkcsyam6n8kfqs8ymwj2mxiqflwbmfl1"; }; - buildInputs = [ cmake qt5.base qt5.tools exiv2 graphicsmagick ]; + buildInputs = [ cmake makeWrapper qt5.base qt5.tools exiv2 graphicsmagick ]; preConfigure = '' export MAGICK_LOCATION="${graphicsmagick}/include/GraphicsMagick" ''; + postInstall = '' + wrapProgram $out/bin/photoqt --set QML2_IMPORT_PATH "${qmlPath}" + ''; + meta = { homepage = "http://photoqt.org/"; description = "Simple, yet powerful and good looking image viewer";