From dfe1dc0c02dc5445fb002cb63e7310c4d56953bb Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 25 Jan 2015 07:30:27 -0600 Subject: [PATCH] xdg-utils: patch xdg-open to use KDE 5 tools --- ...g-open-recognize-KDE_SESSION_VERSION.patch | 25 +++++++++++++++++++ pkgs/tools/X11/xdg-utils/default.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/tools/X11/xdg-utils/0001-xdg-open-recognize-KDE_SESSION_VERSION.patch diff --git a/pkgs/tools/X11/xdg-utils/0001-xdg-open-recognize-KDE_SESSION_VERSION.patch b/pkgs/tools/X11/xdg-utils/0001-xdg-open-recognize-KDE_SESSION_VERSION.patch new file mode 100644 index 00000000000..e7dcf291867 --- /dev/null +++ b/pkgs/tools/X11/xdg-utils/0001-xdg-open-recognize-KDE_SESSION_VERSION.patch @@ -0,0 +1,25 @@ +From 2059662f6bd5de59144d6825d93cb5783110cd97 Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Sat, 24 Jan 2015 17:07:50 -0600 +Subject: [PATCH] xdg-open: recognize KDE_SESSION_VERSION + +--- + scripts/xdg-open | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/scripts/xdg-open b/scripts/xdg-open +index b8db0aa..9fcf458 100755 +--- a/scripts/xdg-open ++++ b/scripts/xdg-open +@@ -341,7 +341,7 @@ open_kde() + if kde-open -v 2>/dev/null 1>&2; then + kde-open "$1" + else +- if [ x"$KDE_SESSION_VERSION" = x"4" ]; then ++ if [ $KDE_SESSION_VERSION -gt 3 ]; then + kfmclient openURL "$1" + else + kfmclient exec "$1" +-- +2.1.4 + diff --git a/pkgs/tools/X11/xdg-utils/default.nix b/pkgs/tools/X11/xdg-utils/default.nix index a0b3283bb04..3e4615609e0 100644 --- a/pkgs/tools/X11/xdg-utils/default.nix +++ b/pkgs/tools/X11/xdg-utils/default.nix @@ -8,6 +8,8 @@ stdenv.mkDerivation rec { sha256 = "00lisw4x43sp189lb7dz46j2l09y5v2fijk3d0sxx3mvwj55a1bv"; }; + patches = [ ./0001-xdg-open-recognize-KDE_SESSION_VERSION.patch ]; + postInstall = '' substituteInPlace $out/bin/xdg-mime --replace /usr/bin/file ${file}/bin/file '';