From 9fa17aa2933cb1e5048d6de3713cb65f562d81f6 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 18 Oct 2015 14:56:30 -0500 Subject: [PATCH] kdoctools: set XDG_DATA_DIRS in setupHook --- .../libraries/kde-frameworks-5.15/kdoctools/default.nix | 1 + .../libraries/kde-frameworks-5.15/kdoctools/setup-hook.sh | 5 +++++ pkgs/development/libraries/qt-5/5.5/make-qt-wrapper.sh | 1 - 3 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/kde-frameworks-5.15/kdoctools/setup-hook.sh diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kdoctools/default.nix b/pkgs/development/libraries/kde-frameworks-5.15/kdoctools/default.nix index f67c19f4239..138c3fc33b9 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/kdoctools/default.nix +++ b/pkgs/development/libraries/kde-frameworks-5.15/kdoctools/default.nix @@ -4,6 +4,7 @@ kdeFramework { name = "kdoctools"; + setupHook = ./setup-hook.sh; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ karchive ]; propagatedBuildInputs = [ ki18n ]; diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kdoctools/setup-hook.sh b/pkgs/development/libraries/kde-frameworks-5.15/kdoctools/setup-hook.sh new file mode 100644 index 00000000000..5cfffbd622d --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.15/kdoctools/setup-hook.sh @@ -0,0 +1,5 @@ +addXdgData() { + addToSearchPath XDG_DATA_DIRS "$1/share" +} + +envHooks+=(addXdgData) diff --git a/pkgs/development/libraries/qt-5/5.5/make-qt-wrapper.sh b/pkgs/development/libraries/qt-5/5.5/make-qt-wrapper.sh index 156d794af7f..4eda9f82faa 100644 --- a/pkgs/development/libraries/qt-5/5.5/make-qt-wrapper.sh +++ b/pkgs/development/libraries/qt-5/5.5/make-qt-wrapper.sh @@ -2,7 +2,6 @@ addQtDependency() { addToSearchPath QT_PLUGIN_PATH "$1/lib/qt5/plugins" addToSearchPath QML_IMPORT_PATH "$1/lib/qt5/imports" addToSearchPath QML2_IMPORT_PATH "$1/lib/qt5/qml" - addToSearchPath XDG_DATA_DIRS "$1/share" } wrapQtProgram() {