mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-09-21 04:28:40 +03:00
Add photoqt-1.1.0.1
Also, add myself to maintainers.
This commit is contained in:
parent
09435f05d4
commit
5e4a8d9fd8
@ -55,6 +55,7 @@
|
|||||||
dmalikov = "Dmitry Malikov <malikov.d.y@gmail.com>";
|
dmalikov = "Dmitry Malikov <malikov.d.y@gmail.com>";
|
||||||
doublec = "Chris Double <chris.double@double.co.nz>";
|
doublec = "Chris Double <chris.double@double.co.nz>";
|
||||||
ederoyd46 = "Matthew Brown <matt@ederoyd.co.uk>";
|
ederoyd46 = "Matthew Brown <matt@ederoyd.co.uk>";
|
||||||
|
eduarrrd = "Eduard Bachmakov <e.bachmakov@gmail.com>";
|
||||||
edwtjo = "Edward Tjörnhammar <ed@cflags.cc>";
|
edwtjo = "Edward Tjörnhammar <ed@cflags.cc>";
|
||||||
eelco = "Eelco Dolstra <eelco.dolstra@logicblox.com>";
|
eelco = "Eelco Dolstra <eelco.dolstra@logicblox.com>";
|
||||||
eikek = "Eike Kettner <eike.kettner@posteo.de>";
|
eikek = "Eike Kettner <eike.kettner@posteo.de>";
|
||||||
|
28
pkgs/applications/graphics/photoqt/default.nix
Normal file
28
pkgs/applications/graphics/photoqt/default.nix
Normal file
@ -0,0 +1,28 @@
|
|||||||
|
{ stdenv, fetchurl, cmake, qt5, exiv2, graphicsmagick }:
|
||||||
|
|
||||||
|
let
|
||||||
|
version = "1.1.0.1";
|
||||||
|
in
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
|
name = "photoqt-${version}";
|
||||||
|
src = fetchurl {
|
||||||
|
url = "http://photoqt.org/pkgs/photoqt-${version}.tar.gz";
|
||||||
|
sha256 = "1y59ys1dgjppahs7v7kxwva7ik23s0x7j2f6glv6sn23l9cfq9rp";
|
||||||
|
};
|
||||||
|
|
||||||
|
buildInputs = [ cmake qt5 exiv2 graphicsmagick ];
|
||||||
|
|
||||||
|
patches = [ ./graphicsmagick-path.patch ];
|
||||||
|
|
||||||
|
preConfigure = ''
|
||||||
|
export MAGICK_LOCATION="${graphicsmagick}/include/GraphicsMagick"
|
||||||
|
'';
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
homepage = "http://photoqt.org/";
|
||||||
|
description = "Simple, yet powerful and good looking image viewer";
|
||||||
|
license = stdenv.lib.licenses.gpl2Plus;
|
||||||
|
platforms = stdenv.lib.platforms.unix;
|
||||||
|
maintainers = [ stdenv.lib.maintainers.eduarrrd ];
|
||||||
|
};
|
||||||
|
}
|
46
pkgs/applications/graphics/photoqt/graphicsmagick-path.patch
Normal file
46
pkgs/applications/graphics/photoqt/graphicsmagick-path.patch
Normal file
@ -0,0 +1,46 @@
|
|||||||
|
--- 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"
|
||||||
|
)
|
||||||
|
|
@ -10549,6 +10549,8 @@ let
|
|||||||
pdftk = callPackage ../tools/typesetting/pdftk { };
|
pdftk = callPackage ../tools/typesetting/pdftk { };
|
||||||
pdfgrep = callPackage ../tools/typesetting/pdfgrep { };
|
pdfgrep = callPackage ../tools/typesetting/pdfgrep { };
|
||||||
|
|
||||||
|
photoqt = callPackage ../applications/graphics/photoqt { };
|
||||||
|
|
||||||
pianobar = callPackage ../applications/audio/pianobar { };
|
pianobar = callPackage ../applications/audio/pianobar { };
|
||||||
|
|
||||||
pianobooster = callPackage ../applications/audio/pianobooster { };
|
pianobooster = callPackage ../applications/audio/pianobooster { };
|
||||||
|
Loading…
Reference in New Issue
Block a user