summary refs log tree commit diff
path: root/pkgs/development
diff options
context:
space:
mode:
authorThomas Tuegel <ttuegel@gmail.com>2015-06-24 07:57:45 -0500
committerThomas Tuegel <ttuegel@gmail.com>2015-06-25 09:03:41 -0500
commit09a53440f172d911e93f4537cf0a89f595c7c8a8 (patch)
tree735c5dd04f5d238bf8e0e55fdb547965dd88ef7f /pkgs/development
parentfa9ed761228ccdb2359890b8805a135f9b0f845e (diff)
downloadnixlib-09a53440f172d911e93f4537cf0a89f595c7c8a8.tar
nixlib-09a53440f172d911e93f4537cf0a89f595c7c8a8.tar.gz
nixlib-09a53440f172d911e93f4537cf0a89f595c7c8a8.tar.bz2
nixlib-09a53440f172d911e93f4537cf0a89f595c7c8a8.tar.lz
nixlib-09a53440f172d911e93f4537cf0a89f595c7c8a8.tar.xz
nixlib-09a53440f172d911e93f4537cf0a89f595c7c8a8.tar.zst
nixlib-09a53440f172d911e93f4537cf0a89f595c7c8a8.zip
qt54: don't propagate build inputs
This disables propagated of Qt 5 build inputs at the request of
@edolstra. If this breaks your build, you need to add the missing
dependencies yourself. If this breaks your package at runtime, you need
to wrap your package to set either the plugin path or the QML import
path.
Diffstat (limited to 'pkgs/development')
-rw-r--r--pkgs/development/libraries/qt-5/5.4/setup-hook.sh6
1 files changed, 0 insertions, 6 deletions
diff --git a/pkgs/development/libraries/qt-5/5.4/setup-hook.sh b/pkgs/development/libraries/qt-5/5.4/setup-hook.sh
index 8ab4071becfb..af581f033ba4 100644
--- a/pkgs/development/libraries/qt-5/5.4/setup-hook.sh
+++ b/pkgs/development/libraries/qt-5/5.4/setup-hook.sh
@@ -24,12 +24,6 @@ addQtModule() {
             @lndir@/bin/lndir -silent "$1/lib" "$qtOut/lib"
             find "$1/lib" -printf 'lib/%P\n' >> "$qtOut/nix-support/qt-inputs"
         fi
-
-        propagatedBuildInputs+=" $1"
-    fi
-
-    if [[ -d "$1/lib/qt5/qml" ]] || [[ -d "$1/lib/qt5/plugins" ]] || [[ -d "$1/lib/qt5/imports" ]]; then
-        propagatedUserEnvPkgs+=" $1"
     fi
 }