From 065a7515a75e15b30840da31dc063564fa4335a4 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 17 Apr 2016 02:21:07 +0300 Subject: [PATCH] qmake4Hook: init --- pkgs/development/libraries/qt-4.x/4.8/qmake-hook.sh | 11 +++++++++++ pkgs/top-level/all-packages.nix | 6 ++++++ 2 files changed, 17 insertions(+) create mode 100644 pkgs/development/libraries/qt-4.x/4.8/qmake-hook.sh diff --git a/pkgs/development/libraries/qt-4.x/4.8/qmake-hook.sh b/pkgs/development/libraries/qt-4.x/4.8/qmake-hook.sh new file mode 100644 index 00000000000..bf716a72d0f --- /dev/null +++ b/pkgs/development/libraries/qt-4.x/4.8/qmake-hook.sh @@ -0,0 +1,11 @@ +qmakeConfigurePhase() { + runHook preConfigure + + $QMAKE PREFIX=$out $qmakeFlags + + runHook postConfigure +} + +export QMAKE=@qt4@/bin/qmake + +configurePhase=qmakeConfigurePhase diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index aef36f574be..dd2abaa4dc4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8544,6 +8544,12 @@ in inherit (pkgs.darwin.apple_sdk.frameworks) ApplicationServices OpenGL Cocoa AGL; }; + qmake48Hook = makeSetupHook + { substitutions = { qt4 = qt48; }; } + ../development/libraries/qt-4.x/4.8/qmake-hook.sh; + + qmake4Hook = qmake48Hook; + qt48Full = appendToName "full" (qt48.override { docs = true; demos = true;