From c5083f8cbd701a09f669dbc021834e980bcd5dbd Mon Sep 17 00:00:00 2001 From: Thomas Tuegel <ttuegel@gmail.com> Date: Sun, 24 Jan 2016 18:43:43 -0600 Subject: [PATCH] kde5.kfilemetadata: fix CMake install paths --- .../libraries/kde-frameworks-5.18/default.nix | 2 +- .../kfilemetadata/cmake-install-paths.patch | 13 +++++++++++++ .../default.nix} | 5 +++-- .../kde-frameworks-5.18/kfilemetadata/series | 1 + 4 files changed, 18 insertions(+), 3 deletions(-) create mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kfilemetadata/cmake-install-paths.patch rename pkgs/development/libraries/kde-frameworks-5.18/{kfilemetadata.nix => kfilemetadata/default.nix} (57%) create mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kfilemetadata/series diff --git a/pkgs/development/libraries/kde-frameworks-5.18/default.nix b/pkgs/development/libraries/kde-frameworks-5.18/default.nix index 2ecde7e834f..5d2cceff78d 100644 --- a/pkgs/development/libraries/kde-frameworks-5.18/default.nix +++ b/pkgs/development/libraries/kde-frameworks-5.18/default.nix @@ -67,7 +67,7 @@ let kdnssd = callPackage ./kdnssd.nix {}; kdoctools = callPackage ./kdoctools {}; kemoticons = callPackage ./kemoticons.nix {}; - kfilemetadata = callPackage ./kfilemetadata.nix {}; + kfilemetadata = callPackage ./kfilemetadata {}; kglobalaccel = callPackage ./kglobalaccel.nix {}; kguiaddons = callPackage ./kguiaddons.nix {}; khtml = callPackage ./khtml.nix {}; diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kfilemetadata/cmake-install-paths.patch b/pkgs/development/libraries/kde-frameworks-5.18/kfilemetadata/cmake-install-paths.patch new file mode 100644 index 00000000000..732f7b69c82 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.18/kfilemetadata/cmake-install-paths.patch @@ -0,0 +1,13 @@ +Index: kfilemetadata-5.18.0/src/CMakeLists.txt +=================================================================== +--- kfilemetadata-5.18.0.orig/src/CMakeLists.txt ++++ kfilemetadata-5.18.0/src/CMakeLists.txt +@@ -49,7 +49,7 @@ install(TARGETS KF5FileMetaData EXPORT K + + install(EXPORT KF5FileMetaDataTargets + NAMESPACE KF5:: +- DESTINATION ${LIB_INSTALL_DIR}/cmake/KF5FileMetaData ++ DESTINATION ${KDE_INSTALL_FULL_CMAKEPACKAGEDIR}/KF5FileMetaData + FILE KF5FileMetaDataTargets.cmake) + + install(FILES diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kfilemetadata.nix b/pkgs/development/libraries/kde-frameworks-5.18/kfilemetadata/default.nix similarity index 57% rename from pkgs/development/libraries/kde-frameworks-5.18/kfilemetadata.nix rename to pkgs/development/libraries/kde-frameworks-5.18/kfilemetadata/default.nix index be99c58d550..9bb4831cf8d 100644 --- a/pkgs/development/libraries/kde-frameworks-5.18/kfilemetadata.nix +++ b/pkgs/development/libraries/kde-frameworks-5.18/kfilemetadata/default.nix @@ -1,9 +1,10 @@ -{ kdeFramework, lib, extra-cmake-modules, attr, ebook_tools, exiv2 -, ffmpeg, karchive, ki18n, poppler, qtbase, taglib +{ kdeFramework, lib, copyPathsToStore, extra-cmake-modules +, attr, ebook_tools, exiv2, ffmpeg, karchive, ki18n, poppler, qtbase, taglib }: kdeFramework { name = "kfilemetadata"; + patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ attr ebook_tools exiv2 ffmpeg karchive poppler taglib ]; propagatedBuildInputs = [ qtbase ki18n ]; diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kfilemetadata/series b/pkgs/development/libraries/kde-frameworks-5.18/kfilemetadata/series new file mode 100644 index 00000000000..d2689425c38 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.18/kfilemetadata/series @@ -0,0 +1 @@ +cmake-install-paths.patch