diff options
author | Thomas Tuegel <ttuegel@gmail.com> | 2016-12-03 09:53:18 -0600 |
---|---|---|
committer | Thomas Tuegel <ttuegel@gmail.com> | 2016-12-03 09:53:18 -0600 |
commit | 53a694e0968430483b27509e7a80aeb8d5b78b87 (patch) | |
tree | 0dafee1ff9561d0148d7537577d70a745f4702c8 /pkgs/development/libraries/qt-5/5.7 | |
parent | 851b5944bb797394728eb368c3cddf51534c73e4 (diff) |
qt5: factor out common qtSubmodule setup hook
Diffstat (limited to 'pkgs/development/libraries/qt-5/5.7')
-rw-r--r-- | pkgs/development/libraries/qt-5/5.7/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/libraries/qt-5/5.7/setup-hook.sh | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/pkgs/development/libraries/qt-5/5.7/default.nix b/pkgs/development/libraries/qt-5/5.7/default.nix index c5d32b8ce0a2a..93a3fdf72b0f2 100644 --- a/pkgs/development/libraries/qt-5/5.7/default.nix +++ b/pkgs/development/libraries/qt-5/5.7/default.nix @@ -50,7 +50,7 @@ let outputs = args.outputs or [ "out" "dev" ]; setOutputFlags = args.setOutputFlags or false; - setupHook = ./setup-hook.sh; + setupHook = ../qtsubmodule-setup-hook.sh; enableParallelBuilding = args.enableParallelBuilding or true; diff --git a/pkgs/development/libraries/qt-5/5.7/setup-hook.sh b/pkgs/development/libraries/qt-5/5.7/setup-hook.sh deleted file mode 100644 index e41433c113861..0000000000000 --- a/pkgs/development/libraries/qt-5/5.7/setup-hook.sh +++ /dev/null @@ -1,2 +0,0 @@ -NIX_QT5_MODULES="${NIX_QT5_MODULES}${NIX_QT5_MODULES:+:}@out@" -NIX_QT5_MODULES_DEV="${NIX_QT5_MODULES_DEV}${NIX_QT5_MODULES_DEV:+:}@dev@" |