diff --git a/pkgs/development/libraries/qt-5/5.5/default.nix b/pkgs/development/libraries/qt-5/5.5/default.nix index fdeb4f7e6c94..92e71aab0912 100644 --- a/pkgs/development/libraries/qt-5/5.5/default.nix +++ b/pkgs/development/libraries/qt-5/5.5/default.nix @@ -49,7 +49,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.6/default.nix b/pkgs/development/libraries/qt-5/5.6/default.nix index 8b4e924a7339..68def625cb2e 100644 --- a/pkgs/development/libraries/qt-5/5.6/default.nix +++ b/pkgs/development/libraries/qt-5/5.6/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.6/setup-hook.sh b/pkgs/development/libraries/qt-5/5.6/setup-hook.sh deleted file mode 100644 index e41433c11386..000000000000 --- a/pkgs/development/libraries/qt-5/5.6/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@" diff --git a/pkgs/development/libraries/qt-5/5.7/default.nix b/pkgs/development/libraries/qt-5/5.7/default.nix index c5d32b8ce0a2..93a3fdf72b0f 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 e41433c11386..000000000000 --- 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@" diff --git a/pkgs/development/libraries/qt-5/5.5/setup-hook.sh b/pkgs/development/libraries/qt-5/qtsubmodule-setup-hook.sh similarity index 100% rename from pkgs/development/libraries/qt-5/5.5/setup-hook.sh rename to pkgs/development/libraries/qt-5/qtsubmodule-setup-hook.sh