diff options
| author | Thomas Tuegel <ttuegel@mailbox.org> | 2021-03-28 14:14:27 -0500 |
|---|---|---|
| committer | Thomas Tuegel <ttuegel@mailbox.org> | 2021-04-07 05:44:56 -0500 |
| commit | 4d4cdf9c910f8fcb02e6fd7e9c0a0e1ec7a40e63 (patch) | |
| tree | 85521df337170e5692035ac437f5a68647aedb3f /pkgs/development/libraries/kde-frameworks | |
| parent | d6e4f4fa657b8e7f90f3262d9d59894d77bf39b3 (diff) | |
| download | nixpkgs-4d4cdf9c910f8fcb02e6fd7e9c0a0e1ec7a40e63.tar nixpkgs-4d4cdf9c910f8fcb02e6fd7e9c0a0e1ec7a40e63.tar.gz nixpkgs-4d4cdf9c910f8fcb02e6fd7e9c0a0e1ec7a40e63.tar.bz2 nixpkgs-4d4cdf9c910f8fcb02e6fd7e9c0a0e1ec7a40e63.tar.lz nixpkgs-4d4cdf9c910f8fcb02e6fd7e9c0a0e1ec7a40e63.tar.xz nixpkgs-4d4cdf9c910f8fcb02e6fd7e9c0a0e1ec7a40e63.tar.zst nixpkgs-4d4cdf9c910f8fcb02e6fd7e9c0a0e1ec7a40e63.zip | |
knewstuff: delay resolving knsrcdir
Diffstat (limited to 'pkgs/development/libraries/kde-frameworks')
| -rw-r--r-- | pkgs/development/libraries/kde-frameworks/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/libraries/kde-frameworks/knewstuff/0001-Delay-resolving-knsrcdir.patch | 25 | ||||
| -rw-r--r-- | pkgs/development/libraries/kde-frameworks/knewstuff/default.nix (renamed from pkgs/development/libraries/kde-frameworks/knewstuff.nix) | 3 |
3 files changed, 29 insertions, 1 deletions
diff --git a/pkgs/development/libraries/kde-frameworks/default.nix b/pkgs/development/libraries/kde-frameworks/default.nix index 200cbad9d78..a3dfcbf44ff 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 00000000000..b42e75267f9 --- /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 <ttuegel@mailbox.org> +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 index 1473e1397bf..63c3178ffd6 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 + ]; } |