From 4d4cdf9c910f8fcb02e6fd7e9c0a0e1ec7a40e63 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 28 Mar 2021 14:14:27 -0500 Subject: [PATCH] knewstuff: delay resolving knsrcdir --- .../libraries/kde-frameworks/default.nix | 2 +- .../0001-Delay-resolving-knsrcdir.patch | 25 +++++++++++++++++++ .../{knewstuff.nix => knewstuff/default.nix} | 3 +++ 3 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/kde-frameworks/knewstuff/0001-Delay-resolving-knsrcdir.patch rename pkgs/development/libraries/kde-frameworks/{knewstuff.nix => knewstuff/default.nix} (91%) diff --git a/pkgs/development/libraries/kde-frameworks/default.nix b/pkgs/development/libraries/kde-frameworks/default.nix index 200cbad9d786..a3dfcbf44ff2 100644 --- a/pkgs/development/libraries/kde-frameworks/default.nix +++ b/pkgs/development/libraries/kde-frameworks/default.nix @@ -161,7 +161,7 @@ let kiconthemes = callPackage ./kiconthemes {}; kinit = callPackage ./kinit {}; kio = callPackage ./kio {}; - knewstuff = callPackage ./knewstuff.nix {}; + knewstuff = callPackage ./knewstuff {}; knotifyconfig = callPackage ./knotifyconfig.nix {}; kparts = callPackage ./kparts.nix {}; kpeople = callPackage ./kpeople.nix {}; diff --git a/pkgs/development/libraries/kde-frameworks/knewstuff/0001-Delay-resolving-knsrcdir.patch b/pkgs/development/libraries/kde-frameworks/knewstuff/0001-Delay-resolving-knsrcdir.patch new file mode 100644 index 000000000000..b42e75267f9f --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks/knewstuff/0001-Delay-resolving-knsrcdir.patch @@ -0,0 +1,25 @@ +From 09b5063e115c36b75e291230175b449a0f6d0c29 Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Sun, 28 Mar 2021 13:34:33 -0500 +Subject: [PATCH] Delay resolving knsrcdir + +--- + KF5NewStuffCoreConfig.cmake.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/KF5NewStuffCoreConfig.cmake.in b/KF5NewStuffCoreConfig.cmake.in +index c65c7c4..3275627 100644 +--- a/KF5NewStuffCoreConfig.cmake.in ++++ b/KF5NewStuffCoreConfig.cmake.in +@@ -3,7 +3,7 @@ + include(CMakeFindDependencyMacro) + find_dependency(KF5Attica "@KF_DEP_VERSION@") + +-set(KDE_INSTALL_KNSRCDIR "@KDE_INSTALL_DATADIR@/knsrcfiles") ++set(KDE_INSTALL_KNSRCDIR "${KDE_INSTALL_DATADIR}/knsrcfiles") + + include("${CMAKE_CURRENT_LIST_DIR}/KF5NewStuffCoreTargets.cmake") + @PACKAGE_INCLUDE_CORE_QCHTARGETS@ +-- +2.30.1 + diff --git a/pkgs/development/libraries/kde-frameworks/knewstuff.nix b/pkgs/development/libraries/kde-frameworks/knewstuff/default.nix similarity index 91% rename from pkgs/development/libraries/kde-frameworks/knewstuff.nix rename to pkgs/development/libraries/kde-frameworks/knewstuff/default.nix index 1473e1397bf1..63c3178ffd6a 100644 --- a/pkgs/development/libraries/kde-frameworks/knewstuff.nix +++ b/pkgs/development/libraries/kde-frameworks/knewstuff/default.nix @@ -16,4 +16,7 @@ mkDerivation { ktextwidgets kwidgetsaddons qtbase qtdeclarative kirigami2 ]; propagatedBuildInputs = [ attica kservice kxmlgui ]; + patches = [ + ./0001-Delay-resolving-knsrcdir.patch + ]; }