public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

kde5.kfilemetadata: fix CMake install paths

This commit is contained in:
Thomas Tuegel 2016-01-24 18:43:43 -06:00
parent 776de6d955
commit c5083f8cbd
4 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/libraries/kde-frameworks-5.18/default.nix
View File

@ -67,7 +67,7 @@ let
kdnssd = callPackage ./kdnssd.nix {}; kdnssd = callPackage ./kdnssd.nix {};
kdoctools = callPackage ./kdoctools {}; kdoctools = callPackage ./kdoctools {};
kemoticons = callPackage ./kemoticons.nix {}; kemoticons = callPackage ./kemoticons.nix {};
kfilemetadata = callPackage ./kfilemetadata.nix {}; kfilemetadata = callPackage ./kfilemetadata {};
kglobalaccel = callPackage ./kglobalaccel.nix {}; kglobalaccel = callPackage ./kglobalaccel.nix {};
kguiaddons = callPackage ./kguiaddons.nix {}; kguiaddons = callPackage ./kguiaddons.nix {};
khtml = callPackage ./khtml.nix {}; khtml = callPackage ./khtml.nix {};

13
pkgs/development/libraries/kde-frameworks-5.18/kfilemetadata/cmake-install-paths.patch Normal file
View File

@ -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

5
pkgs/development/libraries/kde-frameworks-5.18/kfilemetadata.nix → pkgs/development/libraries/kde-frameworks-5.18/kfilemetadata/default.nix
View File

@ -1,9 +1,10 @@
{ kdeFramework, lib, extra-cmake-modules, attr, ebook_tools, exiv2 { kdeFramework, lib, copyPathsToStore, extra-cmake-modules
, ffmpeg, karchive, ki18n, poppler, qtbase, taglib , attr, ebook_tools, exiv2, ffmpeg, karchive, ki18n, poppler, qtbase, taglib
}: }:
kdeFramework { kdeFramework {
name = "kfilemetadata"; name = "kfilemetadata";
patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
nativeBuildInputs = [ extra-cmake-modules ]; nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ attr ebook_tools exiv2 ffmpeg karchive poppler taglib ]; buildInputs = [ attr ebook_tools exiv2 ffmpeg karchive poppler taglib ];
propagatedBuildInputs = [ qtbase ki18n ]; propagatedBuildInputs = [ qtbase ki18n ];

1
pkgs/development/libraries/kde-frameworks-5.18/kfilemetadata/series Normal file
View File

@ -0,0 +1 @@
cmake-install-paths.patch