public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qt5: factor out common qtSubmodule setup hook

Browse Source
This commit is contained in:
Thomas Tuegel
2016-12-03 09:53:18 -06:00
parent 851b5944bb
commit 53a694e096
6 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/qt-5/5.5/default.nix
+1 -1
View File
@@ -49,7 +49,7 @@ let
outputs = args.outputs or [ "out" "dev" ]; outputs = args.outputs or [ "out" "dev" ];
setOutputFlags = args.setOutputFlags or false; setOutputFlags = args.setOutputFlags or false;
setupHook = ./setup-hook.sh; setupHook = ../qtsubmodule-setup-hook.sh;
enableParallelBuilding = args.enableParallelBuilding or true; enableParallelBuilding = args.enableParallelBuilding or true;
pkgs/development/libraries/qt-5/5.6/default.nix
+1 -1
View File
@@ -50,7 +50,7 @@ let
outputs = args.outputs or [ "out" "dev" ]; outputs = args.outputs or [ "out" "dev" ];
setOutputFlags = args.setOutputFlags or false; setOutputFlags = args.setOutputFlags or false;
setupHook = ./setup-hook.sh; setupHook = ../qtsubmodule-setup-hook.sh;
enableParallelBuilding = args.enableParallelBuilding or true; enableParallelBuilding = args.enableParallelBuilding or true;
pkgs/development/libraries/qt-5/5.6/setup-hook.sh
-2
View File
@@ -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@"
pkgs/development/libraries/qt-5/5.7/default.nix
+1 -1
View File
@@ -50,7 +50,7 @@ let
outputs = args.outputs or [ "out" "dev" ]; outputs = args.outputs or [ "out" "dev" ];
setOutputFlags = args.setOutputFlags or false; setOutputFlags = args.setOutputFlags or false;
setupHook = ./setup-hook.sh; setupHook = ../qtsubmodule-setup-hook.sh;
enableParallelBuilding = args.enableParallelBuilding or true; enableParallelBuilding = args.enableParallelBuilding or true;
pkgs/development/libraries/qt-5/5.7/setup-hook.sh
-2
View File
@@ -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@"
pkgs/development/libraries/qt-5/5.5/setup-hook.sh → pkgs/development/libraries/qt-5/qtsubmodule-setup-hook.sh
View File