diff options
| author | Eduard Bachmakov <e.bachmakov@gmail.com> | 2015-06-10 21:36:51 -0400 |
|---|---|---|
| committer | Eduard Bachmakov <e.bachmakov@gmail.com> | 2015-06-10 21:47:50 -0400 |
| commit | 11f0f3cba9bfade848a89a292797cdc0363d6c39 (patch) | |
| tree | 1f6aa3434fd439777e1bdb8847c3873b0fb3e07f /pkgs/applications/graphics/photoqt | |
| parent | 6276ebafaea30797d338ddeee1134fe889251507 (diff) | |
| download | nixpkgs-11f0f3cba9bfade848a89a292797cdc0363d6c39.tar nixpkgs-11f0f3cba9bfade848a89a292797cdc0363d6c39.tar.gz nixpkgs-11f0f3cba9bfade848a89a292797cdc0363d6c39.tar.bz2 nixpkgs-11f0f3cba9bfade848a89a292797cdc0363d6c39.tar.lz nixpkgs-11f0f3cba9bfade848a89a292797cdc0363d6c39.tar.xz nixpkgs-11f0f3cba9bfade848a89a292797cdc0363d6c39.tar.zst nixpkgs-11f0f3cba9bfade848a89a292797cdc0363d6c39.zip | |
photoqt: 1.1.0.1 -> 1.2
remove no longer necessary patch
Diffstat (limited to 'pkgs/applications/graphics/photoqt')
| -rw-r--r-- | pkgs/applications/graphics/photoqt/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/applications/graphics/photoqt/graphicsmagick-path.patch | 46 |
2 files changed, 2 insertions, 50 deletions
diff --git a/pkgs/applications/graphics/photoqt/default.nix b/pkgs/applications/graphics/photoqt/default.nix index 9e2c3a18a63..2d41cfe5189 100644 --- a/pkgs/applications/graphics/photoqt/default.nix +++ b/pkgs/applications/graphics/photoqt/default.nix @@ -1,19 +1,17 @@ { stdenv, fetchurl, cmake, qt5, exiv2, graphicsmagick }: let - version = "1.1.0.1"; + version = "1.2"; in stdenv.mkDerivation rec { name = "photoqt-${version}"; src = fetchurl { url = "http://photoqt.org/pkgs/photoqt-${version}.tar.gz"; - sha256 = "1y59ys1dgjppahs7v7kxwva7ik23s0x7j2f6glv6sn23l9cfq9rp"; + sha256 = "1dnnj2h3j517hcbjxlzk035fis44wdmqq7dvhwpmq1rcr0v32aaa"; }; buildInputs = [ cmake qt5.base qt5.tools exiv2 graphicsmagick ]; - patches = [ ./graphicsmagick-path.patch ]; - preConfigure = '' export MAGICK_LOCATION="${graphicsmagick}/include/GraphicsMagick" ''; diff --git a/pkgs/applications/graphics/photoqt/graphicsmagick-path.patch b/pkgs/applications/graphics/photoqt/graphicsmagick-path.patch deleted file mode 100644 index da9b70e31ed..00000000000 --- a/pkgs/applications/graphics/photoqt/graphicsmagick-path.patch +++ /dev/null @@ -1,46 +0,0 @@ ---- a/CMake/FindMagick.cmake 2014-10-13 19:24:30.000000000 +0200 -+++ b/CMake/FindMagick.cmake 2014-12-27 18:54:19.611759021 +0100 -@@ -19,28 +19,11 @@ - SET(MAGICK++_FOUND "NO" ) - - FIND_PATH( MAGICK_INCLUDE_DIR magick/magick.h -- "$ENV{MAGICK_LOCATION}/magick" -- "$ENV{MAGICK_LOCATION}/include/magick" -- "$ENV{MAGICK_HOME}/include/magick" -- /usr/include/magick -- /usr/include/ -- /usr/include/GraphicsMagick -- /opt/local/include/GraphicsMagick/magick -- /opt/local/include/GraphicsMagick -+ "$ENV{MAGICK_LOCATION}" - ) - - FIND_PATH( MAGICK++_INCLUDE_DIR Magick++.h -- "$ENV{MAGICK++_LOCATION}/Magick++" -- "$ENV{MAGICK++_LOCATION}/include/" -- "$ENV{MAGICK_LOCATION}/Magick++" -- "$ENV{MAGICK_LOCATION}/include/Magick++" -- "$ENV{MAGICK_LOCATION}/include/" -- "$ENV{MAGICK_HOME}/include/" -- /usr/include/Magick++ -- /usr/include/GraphicsMagick -- /usr/include/ -- /opt/local/include/GraphicsMagick/Magick++ -- /opt/local/include/GraphicsMagick -+ "$ENV{MAGICK_LOCATION}" - ) - - FIND_LIBRARY( Magick GraphicsMagick -@@ -55,12 +38,7 @@ - - FIND_LIBRARY( Magick++ GraphicsMagick++ - PATHS -- "$ENV{MAGICK++_LOCATION}/.libs" -- "$ENV{MAGICK_LOCATION}/.libs" -- "$ENV{MAGICK++_LOCATION}/lib" - "$ENV{MAGICK_LOCATION}/lib" -- "$ENV{MAGICK_HOME}/lib" -- /opt/local/lib - DOC "GraphicsMagick Magick++ library" - ) - |