diff options
| author | Eduard Bachmakov <e.bachmakov@gmail.com> | 2014-12-27 00:18:18 +0100 |
|---|---|---|
| committer | Bjørn Forsman <bjorn.forsman@gmail.com> | 2014-12-27 22:13:41 +0100 |
| commit | 5e4a8d9fd8b800663544529b39b0bbc866f93686 (patch) | |
| tree | 5dcd511e074a4af1c9da3b6a9f27a8b38a489f2e | |
| parent | 09435f05d4dac3496f0e7660dbdbaaa18274e910 (diff) | |
| download | nixpkgs-5e4a8d9fd8b800663544529b39b0bbc866f93686.tar nixpkgs-5e4a8d9fd8b800663544529b39b0bbc866f93686.tar.gz nixpkgs-5e4a8d9fd8b800663544529b39b0bbc866f93686.tar.bz2 nixpkgs-5e4a8d9fd8b800663544529b39b0bbc866f93686.tar.lz nixpkgs-5e4a8d9fd8b800663544529b39b0bbc866f93686.tar.xz nixpkgs-5e4a8d9fd8b800663544529b39b0bbc866f93686.tar.zst nixpkgs-5e4a8d9fd8b800663544529b39b0bbc866f93686.zip | |
Add photoqt-1.1.0.1
Also, add myself to maintainers.
| -rw-r--r-- | lib/maintainers.nix | 1 | ||||
| -rw-r--r-- | pkgs/applications/graphics/photoqt/default.nix | 28 | ||||
| -rw-r--r-- | pkgs/applications/graphics/photoqt/graphicsmagick-path.patch | 46 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
4 files changed, 77 insertions, 0 deletions
diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 922ec43cdce..8f75a3330c2 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -55,6 +55,7 @@ dmalikov = "Dmitry Malikov <malikov.d.y@gmail.com>"; doublec = "Chris Double <chris.double@double.co.nz>"; ederoyd46 = "Matthew Brown <matt@ederoyd.co.uk>"; + eduarrrd = "Eduard Bachmakov <e.bachmakov@gmail.com>"; edwtjo = "Edward Tjörnhammar <ed@cflags.cc>"; eelco = "Eelco Dolstra <eelco.dolstra@logicblox.com>"; eikek = "Eike Kettner <eike.kettner@posteo.de>"; diff --git a/pkgs/applications/graphics/photoqt/default.nix b/pkgs/applications/graphics/photoqt/default.nix new file mode 100644 index 00000000000..c16093bfec0 --- /dev/null +++ b/pkgs/applications/graphics/photoqt/default.nix @@ -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 ]; + }; +} diff --git a/pkgs/applications/graphics/photoqt/graphicsmagick-path.patch b/pkgs/applications/graphics/photoqt/graphicsmagick-path.patch new file mode 100644 index 00000000000..da9b70e31ed --- /dev/null +++ b/pkgs/applications/graphics/photoqt/graphicsmagick-path.patch @@ -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" + ) + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 71868190742..70ab2d23f21 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10549,6 +10549,8 @@ let pdftk = callPackage ../tools/typesetting/pdftk { }; pdfgrep = callPackage ../tools/typesetting/pdfgrep { }; + photoqt = callPackage ../applications/graphics/photoqt { }; + pianobar = callPackage ../applications/audio/pianobar { }; pianobooster = callPackage ../applications/audio/pianobooster { }; |