From 642bd5fe92ed64e7a041850793099a35ce6f3142 Mon Sep 17 00:00:00 2001
From: Taahir Ahmed <ahmed.taahir@gmail.com>
Date: Sat, 7 Apr 2018 15:09:35 -0700
Subject: [PATCH] nomacs: 3.6.1 -> 3.8.1

Fixes a build issue introduced by a Qt5 upgrade [1], and lets us drop
our installation-path patch.

[1] https://github.com/nomacs/nomacs/issues/203
---
 pkgs/applications/graphics/nomacs/default.nix       |  6 ++----
 .../graphics/nomacs/fix-appdata-install.patch       | 13 -------------
 2 files changed, 2 insertions(+), 17 deletions(-)
 delete mode 100644 pkgs/applications/graphics/nomacs/fix-appdata-install.patch

diff --git a/pkgs/applications/graphics/nomacs/default.nix b/pkgs/applications/graphics/nomacs/default.nix
index 8c3a8bc894b3..675c4e6a49ef 100644
--- a/pkgs/applications/graphics/nomacs/default.nix
+++ b/pkgs/applications/graphics/nomacs/default.nix
@@ -18,12 +18,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "3.6.1";
+  version = "3.8.1";
   src = fetchFromGitHub {
     owner = "nomacs";
     repo = "nomacs";
     rev = version;
-    sha256 = "0yli05hhmd57v3mynq78nmr15rbpm0vadv273pavmcnayv86yl44";
+    sha256 = "1irms980d7acdqrfn8isw55vgc4d9n26ff86887vk7xfvxs0ayla";
   };
 
   name = "nomacs-${version}";
@@ -34,8 +34,6 @@ stdenv.mkDerivation rec {
     sourceRoot=$(echo */ImageLounge)
   '';
 
-  patches = [./fix-appdata-install.patch];
-
   nativeBuildInputs = [cmake
                        pkgconfig
                        wrapGAppsHook];
diff --git a/pkgs/applications/graphics/nomacs/fix-appdata-install.patch b/pkgs/applications/graphics/nomacs/fix-appdata-install.patch
deleted file mode 100644
index cdeed56f496d..000000000000
--- a/pkgs/applications/graphics/nomacs/fix-appdata-install.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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)