public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #38576 from ahmedtd/nomacs-3.8.1 

nomacs: 3.6.1 -> 3.8.1
This commit is contained in:
Jörg Thalheim 2018-04-08 11:36:22 +01:00 committed by GitHub
parent 5484a90490 642bd5fe92
commit 811ff3f131
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/graphics/nomacs/default.nix
View File

@ -18,12 +18,12 @@
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "3.6.1"; version = "3.8.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "nomacs"; owner = "nomacs";
repo = "nomacs"; repo = "nomacs";
rev = version; rev = version;
sha256 = "0yli05hhmd57v3mynq78nmr15rbpm0vadv273pavmcnayv86yl44"; sha256 = "1irms980d7acdqrfn8isw55vgc4d9n26ff86887vk7xfvxs0ayla";
}; };
name = "nomacs-${version}"; name = "nomacs-${version}";
@ -34,8 +34,6 @@ stdenv.mkDerivation rec {
sourceRoot=$(echo */ImageLounge) sourceRoot=$(echo */ImageLounge)
''; '';
patches = [./fix-appdata-install.patch];
nativeBuildInputs = [cmake nativeBuildInputs = [cmake
pkgconfig pkgconfig
wrapGAppsHook]; wrapGAppsHook];

13
pkgs/applications/graphics/nomacs/fix-appdata-install.patch
View File

@ -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)