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

kde5.kdelibs4support: use multiple outputs

Browse Source
This commit is contained in:
Thomas Tuegel 2016-01-25 20:02:14 -06:00
parent cfd70eac9d
commit 7049bde4d5
5 changed files with 21 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

@ -60,7 +60,7 @@ let
kdbusaddons = callPackage ./kdbusaddons.nix {}; kdbusaddons = callPackage ./kdbusaddons.nix {};
kdeclarative = callPackage ./kdeclarative.nix {}; kdeclarative = callPackage ./kdeclarative.nix {};
kded = callPackage ./kded.nix {}; kded = callPackage ./kded.nix {};
kdelibs4support = callPackage ./kdelibs4support.nix {}; kdelibs4support = callPackage ./kdelibs4support {};
kdesignerplugin = callPackage ./kdesignerplugin.nix {}; kdesignerplugin = callPackage ./kdesignerplugin.nix {};
kdewebkit = callPackage ./kdewebkit.nix {}; kdewebkit = callPackage ./kdewebkit.nix {};
kdesu = callPackage ./kdesu.nix {}; kdesu = callPackage ./kdesu.nix {};

7
pkgs/development/libraries/kde-frameworks-5.18/kdelibs4support.nix → pkgs/development/libraries/kde-frameworks-5.18/kdelibs4support/default.nix
View File

@ -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 , karchive, kcompletion, kconfig, kconfigwidgets, kcoreaddons
, kcrash, kdbusaddons, kded, kdesignerplugin, kdoctools, kemoticons , kcrash, kdbusaddons, kded, kdesignerplugin, kdoctools, kemoticons
, kglobalaccel, kguiaddons, ki18n, kiconthemes, kio, kitemmodels , kglobalaccel, kguiaddons, ki18n, kiconthemes, kio, kitemmodels
@ -11,7 +12,9 @@
kdeFramework { kdeFramework {
name = "kdelibs4support"; name = "kdelibs4support";
outputs = [ "out" ]; outputs = [ "dev" "out" ];
patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
setupHook = ./setup-hook.sh;
nativeBuildInputs = [ extra-cmake-modules kdoctools ]; nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [ buildInputs = [
kcompletion kconfig kded kservice kwidgetsaddons kcompletion kconfig kded kservice kwidgetsaddons

13
pkgs/development/libraries/kde-frameworks-5.18/kdelibs4support/nix-kde-include-dir.patch Normal file
View File

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

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

@ -0,0 +1 @@
nix-kde-include-dir.patch

1
pkgs/development/libraries/kde-frameworks-5.18/kdelibs4support/setup-hook.sh Normal file
View File

@ -0,0 +1 @@
export NIX_KDE_INCLUDE_DIR="@dev@/include/" # trailing slash is required!