summary refs log tree commit diff
diff options
context:
space:
mode:
authorTaahir Ahmed <ahmed.taahir@gmail.com>2017-04-03 03:28:34 -0500
committerJörg Thalheim <Mic92@users.noreply.github.com>2017-04-03 10:28:34 +0200
commit438ac662aa598a065d2f270e78076c55f5d09aa9 (patch)
treeddce99814693679462d522b16848b52a8c7992b0
parenta054f6c0769181d36145011c7bde97d3ada66fd0 (diff)
downloadnixpkgs-438ac662aa598a065d2f270e78076c55f5d09aa9.tar
nixpkgs-438ac662aa598a065d2f270e78076c55f5d09aa9.tar.gz
nixpkgs-438ac662aa598a065d2f270e78076c55f5d09aa9.tar.bz2
nixpkgs-438ac662aa598a065d2f270e78076c55f5d09aa9.tar.lz
nixpkgs-438ac662aa598a065d2f270e78076c55f5d09aa9.tar.xz
nixpkgs-438ac662aa598a065d2f270e78076c55f5d09aa9.tar.zst
nixpkgs-438ac662aa598a065d2f270e78076c55f5d09aa9.zip
nomacs: init at 3.4 (#24580)
* nomacs: init at 3.4

* nomacs: add gsettings for gtk open dialogs

* nomacs: use fetchurl instead of fetchFromGitHub
-rw-r--r--lib/maintainers.nix1
-rw-r--r--pkgs/applications/graphics/nomacs/default.nix66
-rw-r--r--pkgs/applications/graphics/nomacs/fix-appdata-install.patch13
-rw-r--r--pkgs/top-level/all-packages.nix2
4 files changed, 82 insertions, 0 deletions
diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index fb526ec05ba..776b87c80f7 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -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>";
diff --git a/pkgs/applications/graphics/nomacs/default.nix b/pkgs/applications/graphics/nomacs/default.nix
new file mode 100644
index 00000000000..0f0e0984a87
--- /dev/null
+++ b/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;
+  };
+}
diff --git a/pkgs/applications/graphics/nomacs/fix-appdata-install.patch b/pkgs/applications/graphics/nomacs/fix-appdata-install.patch
new file mode 100644
index 00000000000..cdeed56f496
--- /dev/null
+++ b/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)
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 43368d83472..e6b4b7ee6f3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -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 { };