The latest version of ark fails to build due to the patch that does not
apply. The patch seems to be included upstream, so the attached patch
removes it.
>From 9c8dba38d50acd107d0dfbbdcbd9e44939645b7c Mon Sep 17 00:00:00 2001
From: Karn Kallio <[email protected]>
Date: Wed, 13 Jul 2016 18:49:48 -0400
Subject: [PATCH] kde-5 applications ark patch no longer needed.
---
.../kde-5/applications/ark/0001-fix-start-from-plasma.patch | 10 ----------
pkgs/desktops/kde-5/applications/ark/default.nix | 3 ---
2 files changed, 13 deletions(-)
delete mode 100644 pkgs/desktops/kde-5/applications/ark/0001-fix-start-from-plasma.patch
diff --git a/pkgs/desktops/kde-5/applications/ark/0001-fix-start-from-plasma.patch b/pkgs/desktops/kde-5/applications/ark/0001-fix-start-from-plasma.patch
deleted file mode 100644
index 7590e49..0000000
--- a/pkgs/desktops/kde-5/applications/ark/0001-fix-start-from-plasma.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/app/org.kde.ark.desktop.cmake
-+++ b/app/org.kde.ark.desktop.cmake
-@@ -154,7 +154,6 @@
- Terminal=false
- X-DBUS-StartupType=Multi
- X-DBUS-ServiceName=org.kde.ark
--X-KDE-HasTempFileOption=true
- Categories=Qt;KDE;Utility;Archiving;Compression;X-KDE-Utilities-File;
- InitialPreference=3
- Comment=Work with file archives
diff --git a/pkgs/desktops/kde-5/applications/ark/default.nix b/pkgs/desktops/kde-5/applications/ark/default.nix
index 4e68488..331c8c6 100644
--- a/pkgs/desktops/kde-5/applications/ark/default.nix
+++ b/pkgs/desktops/kde-5/applications/ark/default.nix
@@ -35,9 +35,6 @@ kdeApp {
khtml ki18n kio karchive kconfig kcrash kdbusaddons kiconthemes kservice
kpty kwidgetsaddons libarchive
];
- patches = [
- ./0001-fix-start-from-plasma.patch
- ];
postInstall = ''
wrapQtProgram "$out/bin/ark" \
--prefix PATH : "${PATH}"
--
2.9.0
_______________________________________________
nix-dev mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-dev
