ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-09-20 12:08:17 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #8284 from eduarrrd/photoqt

Browse Source 
photoqt: 1.1.0.1 -> 1.2
This commit is contained in:
Pascal Wittmann 2015-06-11 11:36:45 +02:00
commit 681b9bf9f9
2 changed files with 2 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/graphics/photoqt/default.nix
View File

@ -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"
'';

46
pkgs/applications/graphics/photoqt/graphicsmagick-path.patch
View File

@ -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"
)