From 7049bde4d5ffc9475eab99c490e6c35d71eb1534 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 25 Jan 2016 20:02:14 -0600 Subject: [PATCH] kde5.kdelibs4support: use multiple outputs --- .../libraries/kde-frameworks-5.18/default.nix | 2 +- .../default.nix} | 7 +++++-- .../kdelibs4support/nix-kde-include-dir.patch | 13 +++++++++++++ .../kde-frameworks-5.18/kdelibs4support/series | 1 + .../kdelibs4support/setup-hook.sh | 1 + 5 files changed, 21 insertions(+), 3 deletions(-) rename pkgs/development/libraries/kde-frameworks-5.18/{kdelibs4support.nix => kdelibs4support/default.nix} (83%) create mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kdelibs4support/nix-kde-include-dir.patch create mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kdelibs4support/series create mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kdelibs4support/setup-hook.sh diff --git a/pkgs/development/libraries/kde-frameworks-5.18/default.nix b/pkgs/development/libraries/kde-frameworks-5.18/default.nix index 080854380dc..bb96048d6ff 100644 --- a/pkgs/development/libraries/kde-frameworks-5.18/default.nix +++ b/pkgs/development/libraries/kde-frameworks-5.18/default.nix @@ -60,7 +60,7 @@ let kdbusaddons = callPackage ./kdbusaddons.nix {}; kdeclarative = callPackage ./kdeclarative.nix {}; kded = callPackage ./kded.nix {}; - kdelibs4support = callPackage ./kdelibs4support.nix {}; + kdelibs4support = callPackage ./kdelibs4support {}; kdesignerplugin = callPackage ./kdesignerplugin.nix {}; kdewebkit = callPackage ./kdewebkit.nix {}; kdesu = callPackage ./kdesu.nix {}; diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kdelibs4support.nix b/pkgs/development/libraries/kde-frameworks-5.18/kdelibs4support/default.nix similarity index 83% rename from pkgs/development/libraries/kde-frameworks-5.18/kdelibs4support.nix rename to pkgs/development/libraries/kde-frameworks-5.18/kdelibs4support/default.nix index 214b756d5cb..843db83a99b 100644 --- a/pkgs/development/libraries/kde-frameworks-5.18/kdelibs4support.nix +++ b/pkgs/development/libraries/kde-frameworks-5.18/kdelibs4support/default.nix @@ -1,4 +1,5 @@ -{ kdeFramework, lib, extra-cmake-modules, docbook_xml_dtd_45, kauth +{ kdeFramework, lib, copyPathsToStore +, extra-cmake-modules, docbook_xml_dtd_45, kauth , karchive, kcompletion, kconfig, kconfigwidgets, kcoreaddons , kcrash, kdbusaddons, kded, kdesignerplugin, kdoctools, kemoticons , kglobalaccel, kguiaddons, ki18n, kiconthemes, kio, kitemmodels @@ -11,7 +12,9 @@ kdeFramework { name = "kdelibs4support"; - outputs = [ "out" ]; + outputs = [ "dev" "out" ]; + patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); + setupHook = ./setup-hook.sh; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ kcompletion kconfig kded kservice kwidgetsaddons diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kdelibs4support/nix-kde-include-dir.patch b/pkgs/development/libraries/kde-frameworks-5.18/kdelibs4support/nix-kde-include-dir.patch new file mode 100644 index 00000000000..eabb7025448 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.18/kdelibs4support/nix-kde-include-dir.patch @@ -0,0 +1,13 @@ +Index: kdelibs4support-5.18.0/src/kdecore/kstandarddirs.cpp +=================================================================== +--- kdelibs4support-5.18.0.orig/src/kdecore/kstandarddirs.cpp ++++ kdelibs4support-5.18.0/src/kdecore/kstandarddirs.cpp +@@ -292,7 +292,7 @@ static QString relativeInstallPath(const + return QFile::decodeName(ICON_INSTALL_DIR "/"); + } + if (strcmp("include", type) == 0) { +- return QFile::decodeName(INCLUDE_INSTALL_DIR "/"); ++ return QFile::decodeName(qgetenv("NIX_KDE_INCLUDE_DIR")); + } + break; + case 'l': diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kdelibs4support/series b/pkgs/development/libraries/kde-frameworks-5.18/kdelibs4support/series new file mode 100644 index 00000000000..9b08ab20877 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.18/kdelibs4support/series @@ -0,0 +1 @@ +nix-kde-include-dir.patch diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kdelibs4support/setup-hook.sh b/pkgs/development/libraries/kde-frameworks-5.18/kdelibs4support/setup-hook.sh new file mode 100644 index 00000000000..21ac2e83b5d --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.18/kdelibs4support/setup-hook.sh @@ -0,0 +1 @@ +export NIX_KDE_INCLUDE_DIR="@dev@/include/" # trailing slash is required!