From 09a53440f172d911e93f4537cf0a89f595c7c8a8 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 24 Jun 2015 07:57:45 -0500 Subject: [PATCH] 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. --- pkgs/development/libraries/qt-5/5.4/setup-hook.sh | 6 ------ 1 file changed, 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 8ab4071becf..af581f033ba 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 }