Skip to content

Commit

Permalink
nomacs: init at 3.4 (#24580)
Browse files Browse the repository at this point in the history
* nomacs: init at 3.4

* nomacs: add gsettings for gtk open dialogs

* nomacs: use fetchurl instead of fetchFromGitHub
  • Loading branch information
ahmedtd authored and Mic92 committed Apr 3, 2017
1 parent a054f6c commit 438ac66
Show file tree
Hide file tree
Showing 4 changed files with 82 additions and 0 deletions.
1 change: 1 addition & 0 deletions lib/maintainers.nix
Expand Up @@ -25,6 +25,7 @@
aforemny = "Alexander Foremny <alexanderforemny@googlemail.com>";
afranchuk = "Alex Franchuk <alex.franchuk@gmail.com>";
aherrmann = "Andreas Herrmann <andreash87@gmx.ch>";
ahmedtd = "Taahir Ahmed <ahmed.taahir@gmail.com>";
ak = "Alexander Kjeldaas <ak@formalprivacy.com>";
akaWolf = "Artjom Vejsel <akawolf0@gmail.com>";
akc = "Anders Claesson <akc@akc.is>";
Expand Down
66 changes: 66 additions & 0 deletions pkgs/applications/graphics/nomacs/default.nix
@@ -0,0 +1,66 @@
{ stdenv
, fetchFromGitHub
, cmake
, makeWrapper
, pkgconfig
, wrapGAppsHook
, gsettings_desktop_schemas

, qtbase
, qttools
, qtsvg

, exiv2
, opencv
, libraw
, libtiff
, quazip
}:

stdenv.mkDerivation rec {
version = "3.4";
src = fetchFromGitHub {
owner = "nomacs";
repo = "nomacs";
rev = "3.4";
sha256 = "1l7q85dsiss0ix25niybj27zx1ssd439mwj449rxixa351cg1r2z";
};

name = "nomacs-${version}";

enableParallelBuilding = true;

sourceRoot = "${name}/ImageLounge";

patches = [./fix-appdata-install.patch];

nativeBuildInputs = [cmake
pkgconfig
wrapGAppsHook];

buildInputs = [qtbase
qttools
qtsvg
exiv2
opencv
libraw
libtiff
quazip
gsettings_desktop_schemas];


cmakeFlags = ["-DENABLE_OPENCV=ON"
"-DENABLE_RAW=ON"
"-DENABLE_TIFF=ON"
"-DENABLE_QUAZIP=ON"
"-DUSE_SYSTEM_QUAZIP=ON"];

meta = with stdenv.lib; {
homepage = https://nomacs.org;
description = "Qt-based image viewer";
maintainers = [maintainers.ahmedtd];
license = licenses.gpl3Plus;
repositories.git = https://github.com/nomacs/nomacs.git;
inherit (qtbase.meta) platforms;
};
}
13 changes: 13 additions & 0 deletions pkgs/applications/graphics/nomacs/fix-appdata-install.patch
@@ -0,0 +1,13 @@
diff --git a/cmake/UnixBuildTarget.cmake b/cmake/UnixBuildTarget.cmake
index 3521056a..34f99ed9 100644
--- a/cmake/UnixBuildTarget.cmake
+++ b/cmake/UnixBuildTarget.cmake
@@ -80,7 +80,7 @@ install(FILES ${NOMACS_QM} DESTINATION share/nomacs/translations)
# manpage
install(FILES Readme/nomacs.1 DESTINATION share/man/man1)
# appdata
-install(FILES nomacs.appdata.xml DESTINATION /usr/share/appdata/)
+install(FILES nomacs.appdata.xml DESTINATION share/appdata/)

# "make dist" target
string(TOLOWER ${PROJECT_NAME} CPACK_PACKAGE_NAME)
2 changes: 2 additions & 0 deletions pkgs/top-level/all-packages.nix
Expand Up @@ -14814,6 +14814,8 @@ with pkgs;

nedit = callPackage ../applications/editors/nedit { };

nomacs = libsForQt5.callPackage ../applications/graphics/nomacs { };

notepadqq = libsForQt56.callPackage ../applications/editors/notepadqq { };

notmuch = callPackage ../applications/networking/mailreaders/notmuch { };
Expand Down

0 comments on commit 438ac66

Please sign in to comment.