From 065a7515a75e15b30840da31dc063564fa4335a4 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 17 Apr 2016 02:21:07 +0300 Subject: [PATCH 001/103] 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; From b857459bdbce58c833845b6adfdc68b1a204bed5 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 17 Apr 2016 02:22:45 +0300 Subject: [PATCH 002/103] qt5.qmakeHook: init, move from qtbase's setup hook --- .../libraries/qt-5/5.4/default.nix | 5 +- .../libraries/qt-5/5.4/qmake-hook.sh | 120 +++++++++++++++++ .../libraries/qt-5/5.4/qtbase/default.nix | 1 - .../libraries/qt-5/5.4/qtbase/setup-hook.sh | 121 ++---------------- .../libraries/qt-5/5.5/default.nix | 4 +- .../libraries/qt-5/5.5/qmake-hook.sh | 120 +++++++++++++++++ .../libraries/qt-5/5.5/qtbase/default.nix | 1 - .../libraries/qt-5/5.5/qtbase/setup-hook.sh | 109 ---------------- 8 files changed, 252 insertions(+), 229 deletions(-) create mode 100644 pkgs/development/libraries/qt-5/5.4/qmake-hook.sh create mode 100644 pkgs/development/libraries/qt-5/5.5/qmake-hook.sh diff --git a/pkgs/development/libraries/qt-5/5.4/default.nix b/pkgs/development/libraries/qt-5/5.4/default.nix index df2fb8ad186..950129ba541 100644 --- a/pkgs/development/libraries/qt-5/5.4/default.nix +++ b/pkgs/development/libraries/qt-5/5.4/default.nix @@ -37,12 +37,10 @@ let inherit src; propagatedBuildInputs = args.qtInputs ++ (args.propagatedBuildInputs or []); - nativeBuildInputs = (args.nativeBuildInputs or []) ++ [ self.fixQtModuleCMakeConfig ]; + nativeBuildInputs = (args.nativeBuildInputs or []) ++ [ self.fixQtModuleCMakeConfig self.qmakeHook ]; NIX_QT_SUBMODULE = args.NIX_QT_SUBMODULE or true; - dontAddPrefix = args.dontAddPrefix or true; dontFixLibtool = args.dontFixLibtool or true; - configureScript = args.configureScript or "qmake"; outputs = args.outputs or [ "dev" "out" ]; setOutputFlags = false; @@ -109,6 +107,7 @@ let makeQtWrapper = makeSetupHook { deps = [ makeWrapper ]; } ./make-qt-wrapper.sh; fixQtModuleCMakeConfig = makeSetupHook { } ./fix-qt-module-cmake-config.sh; + qmakeHook = makeSetupHook { substitutions = { qt_dev = qtbase.dev; lndir = pkgs.xorg.lndir; }; } ./qmake-hook.sh; }; diff --git a/pkgs/development/libraries/qt-5/5.4/qmake-hook.sh b/pkgs/development/libraries/qt-5/5.4/qmake-hook.sh new file mode 100644 index 00000000000..e8838b854b5 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.4/qmake-hook.sh @@ -0,0 +1,120 @@ +if [[ -z "$QMAKE" ]]; then + +_qtLinkDependencyDir() { + @lndir@/bin/lndir -silent "$1/$2" "$qtOut/$2" + if [ -n "$NIX_QT_SUBMODULE" ]; then + find "$1/$2" -printf "$2/%P\n" >> "$out/nix-support/qt-inputs" + fi +} + +_qtLinkModule() { + if [ -d "$1/mkspecs" ]; then + # $1 is a Qt module + _qtLinkDependencyDir "$1" mkspecs + + for dir in bin include lib share; do + if [ -d "$1/$dir" ]; then + _qtLinkDependencyDir "$1" "$dir" + fi + done + fi +} + +_qtRmModules() { + cat "$out/nix-support/qt-inputs" | while read file; do + if [ -h "$out/$file" ]; then + rm "$out/$file" + fi + done + + cat "$out/nix-support/qt-inputs" | while read file; do + if [ -d "$out/$file" ]; then + rmdir --ignore-fail-on-non-empty -p "$out/$file" + fi + done + + rm "$out/nix-support/qt-inputs" +} + +_qtPropagateRuntimeDependencies() { + for dir in "lib/qt5/plugins" "lib/qt5/qml" "lib/qt5/imports"; do + if [ -d "$1/$dir" ]; then + propagateOnce propagatedBuildInputs "$1" + propagateOnce propagatedUserEnvPkgs "$1" + break + fi + done + addToSearchPathOnce QT_PLUGIN_PATH "$1/lib/qt5/plugins" + addToSearchPathOnce QML_IMPORT_PATH "$1/lib/qt5/imports" + addToSearchPathOnce QML2_IMPORT_PATH "$1/lib/qt5/qml" +} + +_qtRmQmake() { + rm "$qtOut/bin/qmake" "$qtOut/bin/qt.conf" +} + +_qtSetQmakePath() { + export PATH="$qtOut/bin${PATH:+:}$PATH" +} + +_qtMultioutModuleDevs() { + # We cannot simply set these paths in configureFlags because libQtCore retains + # references to the paths it was built with. + moveToOutput "bin" "${!outputDev}" + moveToOutput "include" "${!outputDev}" + + # The destination directory must exist or moveToOutput will do nothing + mkdir -p "${!outputDev}/share" + moveToOutput "share/doc" "${!outputDev}" +} + +_qtMultioutDevs() { + # This is necessary whether the package is a Qt module or not + moveToOutput "mkspecs" "${!outputDev}" +} + +qmakeConfigurePhase() { + runHook preConfigure + + qmake PREFIX=$out $qmakeFlags + + runHook postConfigure +} + +qtOut="" +if [[ -z "$NIX_QT_SUBMODULE" ]]; then + qtOut=`mktemp -d` +else + qtOut=$out +fi + +mkdir -p "$qtOut/bin" "$qtOut/mkspecs" "$qtOut/include" "$qtOut/nix-support" "$qtOut/lib" "$qtOut/share" + +cp "@qt_dev@/bin/qmake" "$qtOut/bin" +cat >"$qtOut/bin/qt.conf" <> "$out/nix-support/qt-inputs" - fi -} - -_qtLinkModule() { - if [ -d "$1/mkspecs" ]; then - # $1 is a Qt module - _qtLinkDependencyDir "$1" mkspecs - - for dir in bin include lib share; do - if [ -d "$1/$dir" ]; then - _qtLinkDependencyDir "$1" "$dir" - fi - done - fi -} - -_qtRmModules() { - cat "$out/nix-support/qt-inputs" | while read file; do - if [[ -h "$out/$file" ]]; then - rm "$out/$file" - fi - done - - cat "$out/nix-support/qt-inputs" | while read file; do - if [[ -d "$out/$file" ]]; then - rmdir --ignore-fail-on-non-empty -p "$out/$file" - fi - done - - rm "$out/nix-support/qt-inputs" -} - addToSearchPathOnceWithCustomDelimiter() { local delim="$1" local search="$2" @@ -43,11 +5,14 @@ addToSearchPathOnceWithCustomDelimiter() { local dirs local exported IFS="$delim" read -a dirs <<< "${!search}" - for dir in ${dirs[@]}; do - if [ "z$dir" == "z$target" ]; then exported=1; fi - done - if [ -z $exported ]; then - eval "export ${search}=\"${!search}${!search:+$delim}$target\"" + local canonical + if canonical=$(readlink -e "$target"); then + for dir in ${dirs[@]}; do + if [ "z$dir" == "z$canonical" ]; then exported=1; fi + done + if [ -z $exported ]; then + eval "export ${search}=\"${!search}${!search:+$delim}$canonical\"" + fi fi } @@ -59,76 +24,6 @@ propagateOnce() { addToSearchPathOnceWithCustomDelimiter ' ' "$@" } -_qtPropagateRuntimeDependencies() { - for dir in "lib/qt5/plugins" "lib/qt5/qml" "lib/qt5/imports"; do - if [ -d "$1/$dir" ]; then - propagateOnce propagatedBuildInputs "$1" - break - fi - done - addToSearchPathOnce QT_PLUGIN_PATH "$1/lib/qt5/plugins" - addToSearchPathOnce QML_IMPORT_PATH "$1/lib/qt5/imports" - addToSearchPathOnce QML2_IMPORT_PATH "$1/lib/qt5/qml" -} - -_qtRmQmake() { - rm "$qtOut/bin/qmake" "$qtOut/bin/qt.conf" -} - -_qtSetQmakePath() { - export PATH="$qtOut/bin${PATH:+:}$PATH" -} - -_qtMultioutModuleDevs() { - # We cannot simply set these paths in configureFlags because libQtCore retains - # references to the paths it was built with. - moveToOutput "bin" "${!outputDev}" - moveToOutput "include" "${!outputDev}" - - # The destination directory must exist or moveToOutput will do nothing - mkdir -p "${!outputDev}/share" - moveToOutput "share/doc" "${!outputDev}" -} - -_qtMultioutDevs() { - # This is necessary whether the package is a Qt module or not - moveToOutput "mkspecs" "${!outputDev}" -} - -qtOut="" -if [[ -z "$NIX_QT_SUBMODULE" ]]; then - qtOut=`mktemp -d` -else - qtOut=$out -fi - -mkdir -p "$qtOut/bin" "$qtOut/mkspecs" "$qtOut/include" "$qtOut/nix-support" "$qtOut/lib" "$qtOut/share" - -cp "@dev@/bin/qmake" "$qtOut/bin" -cat >"$qtOut/bin/qt.conf" <> "$out/nix-support/qt-inputs" + fi +} + +_qtLinkModule() { + if [ -d "$1/mkspecs" ]; then + # $1 is a Qt module + _qtLinkDependencyDir "$1" mkspecs + + for dir in bin include lib share; do + if [ -d "$1/$dir" ]; then + _qtLinkDependencyDir "$1" "$dir" + fi + done + fi +} + +_qtRmModules() { + cat "$out/nix-support/qt-inputs" | while read file; do + if [ -h "$out/$file" ]; then + rm "$out/$file" + fi + done + + cat "$out/nix-support/qt-inputs" | while read file; do + if [ -d "$out/$file" ]; then + rmdir --ignore-fail-on-non-empty -p "$out/$file" + fi + done + + rm "$out/nix-support/qt-inputs" +} + +_qtPropagateRuntimeDependencies() { + for dir in "lib/qt5/plugins" "lib/qt5/qml" "lib/qt5/imports"; do + if [ -d "$1/$dir" ]; then + propagateOnce propagatedBuildInputs "$1" + propagateOnce propagatedUserEnvPkgs "$1" + break + fi + done + addToSearchPathOnce QT_PLUGIN_PATH "$1/lib/qt5/plugins" + addToSearchPathOnce QML_IMPORT_PATH "$1/lib/qt5/imports" + addToSearchPathOnce QML2_IMPORT_PATH "$1/lib/qt5/qml" +} + +_qtRmQmake() { + rm "$qtOut/bin/qmake" "$qtOut/bin/qt.conf" +} + +_qtSetQmakePath() { + export PATH="$qtOut/bin${PATH:+:}$PATH" +} + +_qtMultioutModuleDevs() { + # We cannot simply set these paths in configureFlags because libQtCore retains + # references to the paths it was built with. + moveToOutput "bin" "${!outputDev}" + moveToOutput "include" "${!outputDev}" + + # The destination directory must exist or moveToOutput will do nothing + mkdir -p "${!outputDev}/share" + moveToOutput "share/doc" "${!outputDev}" +} + +_qtMultioutDevs() { + # This is necessary whether the package is a Qt module or not + moveToOutput "mkspecs" "${!outputDev}" +} + +qmakeConfigurePhase() { + runHook preConfigure + + qmake PREFIX=$out $qmakeFlags + + runHook postConfigure +} + +qtOut="" +if [[ -z "$NIX_QT_SUBMODULE" ]]; then + qtOut=`mktemp -d` +else + qtOut=$out +fi + +mkdir -p "$qtOut/bin" "$qtOut/mkspecs" "$qtOut/include" "$qtOut/nix-support" "$qtOut/lib" "$qtOut/share" + +cp "@qt_dev@/bin/qmake" "$qtOut/bin" +cat >"$qtOut/bin/qt.conf" <> "$out/nix-support/qt-inputs" - fi -} - -_qtLinkModule() { - if [ -d "$1/mkspecs" ]; then - # $1 is a Qt module - _qtLinkDependencyDir "$1" mkspecs - - for dir in bin include lib share; do - if [ -d "$1/$dir" ]; then - _qtLinkDependencyDir "$1" "$dir" - fi - done - fi -} - -_qtRmModules() { - cat "$out/nix-support/qt-inputs" | while read file; do - if [ -h "$out/$file" ]; then - rm "$out/$file" - fi - done - - cat "$out/nix-support/qt-inputs" | while read file; do - if [ -d "$out/$file" ]; then - rmdir --ignore-fail-on-non-empty -p "$out/$file" - fi - done - - rm "$out/nix-support/qt-inputs" -} - addToSearchPathOnceWithCustomDelimiter() { local delim="$1" local search="$2" @@ -62,77 +24,6 @@ propagateOnce() { addToSearchPathOnceWithCustomDelimiter ' ' "$@" } -_qtPropagateRuntimeDependencies() { - for dir in "lib/qt5/plugins" "lib/qt5/qml" "lib/qt5/imports"; do - if [ -d "$1/$dir" ]; then - propagateOnce propagatedBuildInputs "$1" - propagateOnce propagatedUserEnvPkgs "$1" - break - fi - done - addToSearchPathOnce QT_PLUGIN_PATH "$1/lib/qt5/plugins" - addToSearchPathOnce QML_IMPORT_PATH "$1/lib/qt5/imports" - addToSearchPathOnce QML2_IMPORT_PATH "$1/lib/qt5/qml" -} - -_qtRmQmake() { - rm "$qtOut/bin/qmake" "$qtOut/bin/qt.conf" -} - -_qtSetQmakePath() { - export PATH="$qtOut/bin${PATH:+:}$PATH" -} - -_qtMultioutModuleDevs() { - # We cannot simply set these paths in configureFlags because libQtCore retains - # references to the paths it was built with. - moveToOutput "bin" "${!outputDev}" - moveToOutput "include" "${!outputDev}" - - # The destination directory must exist or moveToOutput will do nothing - mkdir -p "${!outputDev}/share" - moveToOutput "share/doc" "${!outputDev}" -} - -_qtMultioutDevs() { - # This is necessary whether the package is a Qt module or not - moveToOutput "mkspecs" "${!outputDev}" -} - -qtOut="" -if [ -z "$NIX_QT_SUBMODULE" ]; then - qtOut=`mktemp -d` -else - qtOut=$out -fi - -mkdir -p "$qtOut/bin" "$qtOut/mkspecs" "$qtOut/include" "$qtOut/nix-support" "$qtOut/lib" "$qtOut/share" - -cp "@dev@/bin/qmake" "$qtOut/bin" -cat >"$qtOut/bin/qt.conf" < Date: Sun, 17 Apr 2016 02:23:21 +0300 Subject: [PATCH 003/103] memorycoin: move to qmake4Hook --- pkgs/applications/altcoins/memorycoin.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/altcoins/memorycoin.nix b/pkgs/applications/altcoins/memorycoin.nix index 4e5e24e3062..0470fd21eae 100644 --- a/pkgs/applications/altcoins/memorycoin.nix +++ b/pkgs/applications/altcoins/memorycoin.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, openssl, db48, boost -, zlib, miniupnpc, qt4, utillinux, protobuf, qrencode +, zlib, miniupnpc, qt4, qmake4Hook, utillinux, protobuf, qrencode , withGui }: with stdenv.lib; @@ -15,13 +15,11 @@ stdenv.mkDerivation rec{ buildInputs = [ pkgconfig openssl db48 boost zlib miniupnpc utillinux protobuf ] - ++ optionals withGui [ qt4 qrencode ]; + ++ optionals withGui [ qt4 qmake4Hook qrencode ]; configureFlags = [ "--with-boost-libdir=${boost.lib}/lib" ] ++ optionals withGui [ "--with-gui=qt4" ]; - configurePhase = optional withGui "qmake"; - preBuild = optional (!withGui) "cd src; cp makefile.unix Makefile"; installPhase = From a6e731a8f822ecf5984068105c6133028da37942 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 17 Apr 2016 02:23:39 +0300 Subject: [PATCH 004/103] namecoin: move to qmake4Hook --- pkgs/applications/altcoins/namecoin.nix | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/altcoins/namecoin.nix b/pkgs/applications/altcoins/namecoin.nix index f2e2aae698e..563363b8baf 100644 --- a/pkgs/applications/altcoins/namecoin.nix +++ b/pkgs/applications/altcoins/namecoin.nix @@ -1,4 +1,4 @@ -{ stdenv, db4, boost, openssl, qt4, miniupnpc, unzip, namecoind }: +{ stdenv, db4, boost, openssl, qt4, qmake4Hook, miniupnpc, unzip, namecoind }: with stdenv.lib; stdenv.mkDerivation rec { @@ -7,15 +7,9 @@ stdenv.mkDerivation rec { version = namecoind.version; src = namecoind.src; - buildInputs = [ db4 boost openssl unzip qt4 miniupnpc ]; + buildInputs = [ db4 boost openssl unzip qt4 qmake4Hook miniupnpc ]; - configurePhase = '' - qmake USE_UPNP=- - ''; - - buildPhase = '' - make - ''; + qmakeFlags = [ "USE_UPNP=-" ]; installPhase = '' mkdir -p $out/bin From 3a713b166e7c656b476ebd5a9abb53f46a89fd4a Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 17 Apr 2016 02:24:07 +0300 Subject: [PATCH 005/103] primecoin: move to qmake4Hook --- pkgs/applications/altcoins/primecoin.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/altcoins/primecoin.nix b/pkgs/applications/altcoins/primecoin.nix index 61bba04cb6a..360a39a4fd8 100644 --- a/pkgs/applications/altcoins/primecoin.nix +++ b/pkgs/applications/altcoins/primecoin.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, openssl, db48, boost -, zlib, miniupnpc, qt4, utillinux, protobuf, qrencode +, zlib, miniupnpc, qt4, qmake4Hook, utillinux, protobuf, qrencode , withGui }: with stdenv.lib; @@ -15,13 +15,11 @@ stdenv.mkDerivation rec{ buildInputs = [ pkgconfig openssl db48 boost zlib miniupnpc utillinux protobuf ] - ++ optionals withGui [ qt4 qrencode ]; + ++ optionals withGui [ qt4 qmake4Hook qrencode ]; configureFlags = [ "--with-boost-libdir=${boost.lib}/lib" ] ++ optionals withGui [ "--with-gui=qt4" ]; - configurePhase = optional withGui "qmake"; - preBuild = optional (!withGui) "cd src; cp makefile.unix Makefile"; installPhase = From a3d909836d28ef164abfc930299c05b9885777b2 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 16 Apr 2016 22:59:20 +0300 Subject: [PATCH 006/103] dfasma: move to qmakeHook This reverts commit 4dde716a0510b352abf67ed08902422d9ec3b214. --- pkgs/applications/audio/dfasma/default.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/audio/dfasma/default.nix b/pkgs/applications/audio/dfasma/default.nix index 94f20bc543e..d006f2c0178 100644 --- a/pkgs/applications/audio/dfasma/default.nix +++ b/pkgs/applications/audio/dfasma/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fftw, libsndfile, qtbase, qtmultimedia, makeQtWrapper }: +{ stdenv, fetchFromGitHub, fftw, libsndfile, qtbase, qtmultimedia, qmakeHook, makeQtWrapper }: let @@ -37,7 +37,7 @@ in stdenv.mkDerivation rec { owner = "gillesdegottex"; }; - buildInputs = [ fftw libsndfile qtbase qtmultimedia ]; + buildInputs = [ fftw libsndfile qtbase qtmultimedia qmakeHook ]; nativeBuildInputs = [ makeQtWrapper ]; @@ -47,10 +47,8 @@ in stdenv.mkDerivation rec { cp -Rv "${libqaudioextra.src}"/* external/libqaudioextra ''; - configurePhase = '' - runHook preConfigure - qmake PREFIX=$out PREFIXSHORTCUT=$out dfasma.pro - runHook postConfigure + preConfigure = '' + qmakeFlags="$qmakeFlags PREFIXSHORTCUT=$out" ''; enableParallelBuilding = true; From 222c4a221eb0ed6498d47562b51fe7b203984747 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 16 Apr 2016 22:59:19 +0300 Subject: [PATCH 007/103] fmit: move to qmakeHook This reverts commit 97d89ad7eee9dcfd17b696ebd69b30d242c2d3cb. --- pkgs/applications/audio/fmit/default.nix | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/audio/fmit/default.nix b/pkgs/applications/audio/fmit/default.nix index c27e049a4ae..83367b83e48 100644 --- a/pkgs/applications/audio/fmit/default.nix +++ b/pkgs/applications/audio/fmit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fftw, freeglut, qtbase, qtmultimedia +{ stdenv, fetchFromGitHub, fftw, freeglut, mesa_glu, qtbase, qtmultimedia, qmakeHook , alsaSupport ? true, alsaLib ? null , jackSupport ? false, libjack2 ? null , portaudioSupport ? false, portaudio ? null }: @@ -18,22 +18,17 @@ stdenv.mkDerivation rec { owner = "gillesdegottex"; }; - buildInputs = [ fftw freeglut qtbase qtmultimedia ] + buildInputs = [ fftw freeglut mesa_glu qtbase qtmultimedia qmakeHook ] ++ stdenv.lib.optionals alsaSupport [ alsaLib ] ++ stdenv.lib.optionals jackSupport [ libjack2 ] ++ stdenv.lib.optionals portaudioSupport [ portaudio ]; - configurePhase = '' - runHook preConfigure - mkdir build - cd build - qmake \ + preConfigure = '' + qmakeFlags="$qmakeFlags \ CONFIG+=${stdenv.lib.optionalString alsaSupport "acs_alsa"} \ CONFIG+=${stdenv.lib.optionalString jackSupport "acs_jack"} \ CONFIG+=${stdenv.lib.optionalString portaudioSupport "acs_portaudio"} \ - PREFIX="$out" PREFIXSHORTCUT="$out" \ - ../fmit.pro - runHook postConfigure + PREFIXSHORTCUT=$out" ''; enableParallelBuilding = true; From eb3a5a300213f7bebade0ef60a7492b012f6b402 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 16 Apr 2016 22:59:19 +0300 Subject: [PATCH 008/103] iannix: move to qmakeHook This reverts commit bb543e1540e0e70180e60285b7a353f0c32dc101. --- pkgs/applications/audio/iannix/default.nix | 10 +++------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/audio/iannix/default.nix b/pkgs/applications/audio/iannix/default.nix index f17abf97521..83fd2b14ed2 100644 --- a/pkgs/applications/audio/iannix/default.nix +++ b/pkgs/applications/audio/iannix/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, alsaLib, pkgconfig, qt5 +{ stdenv, fetchFromGitHub, alsaLib, pkgconfig, qtbase, qtscript, qmakeHook }: stdenv.mkDerivation rec { @@ -11,13 +11,9 @@ stdenv.mkDerivation rec { sha256 = "184ydb9f1303v332k5k3f1ki7cb6nkxhh6ij0yn72v7dp7figrgj"; }; - buildInputs = [ alsaLib pkgconfig qt5.qtbase qt5.qtscript ]; + buildInputs = [ alsaLib pkgconfig qtbase qtscript qmakeHook ]; - configurePhase = '' - runHook preConfigure - qmake PREFIX=/ - runHook postConfigure - ''; + qmakeFlags = [ "PREFIX=/" ]; installFlags = [ "INSTALL_ROOT=$(out)" ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dd2abaa4dc4..90d766c925a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1939,7 +1939,7 @@ in iasl = callPackage ../development/compilers/iasl { }; - iannix = callPackage ../applications/audio/iannix { }; + iannix = qt5.callPackage ../applications/audio/iannix { }; icecast = callPackage ../servers/icecast { }; From c579c21b04d0607c4f895db9c42232958461de70 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 16 Apr 2016 22:59:19 +0300 Subject: [PATCH 009/103] keyfinder: move to qmakeHook This reverts commit 6d9147abab8840c61b14be13aa029ff9275cb700. --- pkgs/applications/audio/keyfinder/default.nix | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/audio/keyfinder/default.nix b/pkgs/applications/audio/keyfinder/default.nix index 049920d2807..0cacd772493 100644 --- a/pkgs/applications/audio/keyfinder/default.nix +++ b/pkgs/applications/audio/keyfinder/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, libav_0_8, libkeyfinder, qtbase, qtxmlpatterns, taglib }: +{ stdenv, fetchFromGitHub, libav_0_8, libkeyfinder, qtbase, qtxmlpatterns, qmakeHook, taglib }: stdenv.mkDerivation rec { name = "keyfinder-${version}"; @@ -11,21 +11,14 @@ stdenv.mkDerivation rec { owner = "ibsh"; }; - buildInputs = [ libav_0_8 libkeyfinder qtbase qtxmlpatterns taglib ]; + buildInputs = [ libav_0_8 libkeyfinder qtbase qtxmlpatterns qmakeHook taglib ]; postPatch = '' substituteInPlace is_KeyFinder.pro \ --replace "keyfinder.0" "keyfinder" \ - --replace '$$[QT_INSTALL_PREFIX]' "$out" \ --replace "-stdlib=libc++" "" ''; - configurePhase = '' - runHook preConfigure - qmake - runHook postConfigure - ''; - enableParallelBuilding = true; meta = with stdenv.lib; { From 22a09f1f71d656ada326ec7b9c958f6304d2714c Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 17 Apr 2016 02:25:36 +0300 Subject: [PATCH 010/103] qtscrobbler: move to qmake4Hook --- pkgs/applications/audio/qtscrobbler/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/audio/qtscrobbler/default.nix b/pkgs/applications/audio/qtscrobbler/default.nix index e7108ebe487..453da89953e 100644 --- a/pkgs/applications/audio/qtscrobbler/default.nix +++ b/pkgs/applications/audio/qtscrobbler/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, withMtp ? true, libmtp, pkgconfig, which, qt4 }: +{ stdenv, lib, fetchurl, withMtp ? true, libmtp, pkgconfig, which, qt4, qmake4Hook }: stdenv.mkDerivation rec { name = "qtscrobbler-${version}"; @@ -9,18 +9,16 @@ stdenv.mkDerivation rec { sha256 = "01c8e48f616ed09504833d27d92fd62f455bd645ea2d1cc2a5f4c287d641daba"; }; - nativeBuildInputs = lib.optionals withMtp [ pkgconfig which ]; + nativeBuildInputs = [ qmake4Hook ] ++ lib.optionals withMtp [ pkgconfig which ]; buildInputs = [ qt4 ] ++ lib.optional withMtp libmtp; enableParallelBuilding = true; postPatch = '' cd src - sed -i "s,/usr/local,$out," common.pri + sed -i -e "s,/usr/local,$out," -e "s,/usr,," common.pri ''; - configurePhase = "qmake"; - meta = with lib; { description = "Qt based last.fm scrobbler"; longDescription = '' From 395a4b819be6f59ec8fdb841071b0508e7b7c0be Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 17 Apr 2016 02:26:19 +0300 Subject: [PATCH 011/103] sonic-visualiser: move to qmakeHook --- pkgs/applications/audio/sonic-visualiser/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/audio/sonic-visualiser/default.nix b/pkgs/applications/audio/sonic-visualiser/default.nix index ae7a39240a5..31a95c51fc5 100644 --- a/pkgs/applications/audio/sonic-visualiser/default.nix +++ b/pkgs/applications/audio/sonic-visualiser/default.nix @@ -3,7 +3,7 @@ { stdenv, fetchurl, alsaLib, bzip2, fftw, libjack2, libX11, liblo , libmad, libogg, librdf, librdf_raptor, librdf_rasqal, libsamplerate , libsndfile, pkgconfig, libpulseaudio, makeQtWrapper, qtbase, redland -, rubberband, serd, sord, vampSDK, fftwFloat +, qmakeHook, rubberband, serd, sord, vampSDK, fftwFloat }: stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { }; buildInputs = - [ libsndfile qtbase fftw fftwFloat bzip2 librdf rubberband + [ libsndfile qtbase qmakeHook fftw fftwFloat bzip2 librdf rubberband libsamplerate vampSDK alsaLib librdf_raptor librdf_rasqal redland serd sord @@ -32,13 +32,12 @@ stdenv.mkDerivation rec { libX11 ]; - nativeBuildInputs = [ makeQtWrapper ]; + nativeBuildInputs = [ makeQtWrapper qmakeHook ]; - buildPhase = '' + configurePhase = '' for i in sonic-visualiser svapp svcore svgui; - do cd $i && qmake -makefile PREFIX=$out && cd ..; + do cd $i && qmake PREFIX=$out && cd ..; done - make ''; installPhase = '' From 448100fe83ac36a4355f5fa9136c2c77aac1270e Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 17 Apr 2016 02:26:41 +0300 Subject: [PATCH 012/103] focuswriter: move to qmake4Hook --- pkgs/applications/editors/focuswriter/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/editors/focuswriter/default.nix b/pkgs/applications/editors/focuswriter/default.nix index bc9163e63cb..eedb674b472 100644 --- a/pkgs/applications/editors/focuswriter/default.nix +++ b/pkgs/applications/editors/focuswriter/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, qt4, pkgconfig, hunspell}: +{ stdenv, fetchurl, qt4, qmake4Hook, pkgconfig, hunspell }: stdenv.mkDerivation rec { name = "focuswriter-${version}"; @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { sha256 = "1i58jxbiy95ijf81g8c3gwxhcg3irzssna3wv7vhrd57g4lcfj0w"; }; - buildInputs = [ qt4 pkgconfig hunspell ]; + buildInputs = [ qt4 qmake4Hook pkgconfig hunspell ]; - configurePhase = "qmake PREFIX=/"; + qmakeFlags = [ "PREFIX=/" ]; - installPhase = "make install INSTALL_ROOT=$out"; + installFlags = [ "INSTALL_ROOT=$(out)" ]; meta = { description = "Simple, distraction-free writing environment"; From b1dcfeeeebde011361d6a211fe4a3ab7eaee4a5a Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 17 Apr 2016 02:26:57 +0300 Subject: [PATCH 013/103] texmaker: move to qmake4Hook --- pkgs/applications/editors/texmaker/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/texmaker/default.nix b/pkgs/applications/editors/texmaker/default.nix index 04ebf195108..83165f0a505 100644 --- a/pkgs/applications/editors/texmaker/default.nix +++ b/pkgs/applications/editors/texmaker/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, qt4, poppler_qt4, zlib, pkgconfig, poppler}: +{ stdenv, fetchurl, qt4, qmake4Hook, poppler_qt4, zlib, pkgconfig, poppler }: stdenv.mkDerivation rec { pname = "texmaker"; @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { }; buildInputs = [ qt4 poppler_qt4 zlib ]; - nativeBuildInputs = [ pkgconfig poppler ]; + nativeBuildInputs = [ pkgconfig poppler qmake4Hook ]; NIX_CFLAGS_COMPILE="-I${poppler}/include/poppler"; preConfigure = '' - qmake PREFIX=$out DESKTOPDIR=$out/share/applications ICONDIR=$out/share/pixmaps texmaker.pro + qmakeFlags="$qmakeFlags DESKTOPDIR=$out/share/applications ICONDIR=$out/share/pixmaps" ''; meta = with stdenv.lib; { From 6d96f2f3b4722b894d1338fc75410f02f2be4352 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 17 Apr 2016 02:27:11 +0300 Subject: [PATCH 014/103] texstudio: move to qmake4Hook --- pkgs/applications/editors/texstudio/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/editors/texstudio/default.nix b/pkgs/applications/editors/texstudio/default.nix index 4b0cccae364..4accf1cad67 100644 --- a/pkgs/applications/editors/texstudio/default.nix +++ b/pkgs/applications/editors/texstudio/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, qt4, poppler_qt4, zlib, pkgconfig}: +{ stdenv, fetchurl, qt4, qmake4Hook, poppler_qt4, zlib, pkgconfig}: stdenv.mkDerivation rec { pname = "texstudio"; @@ -11,11 +11,9 @@ stdenv.mkDerivation rec { sha256 = "1smmc4xqs8x8qzp6iqj2wr4xarfnxxxp6rq6chx1kb256w75jwfw"; }; - buildInputs = [ qt4 poppler_qt4 zlib pkgconfig]; + buildInputs = [ qt4 qmake4Hook poppler_qt4 zlib pkgconfig ]; - preConfigure = '' - qmake PREFIX=$out NO_APPDATA=True texstudio.pro - ''; + qmakeFlags = [ "NO_APPDATA=True" ]; meta = with stdenv.lib; { description = "TeX and LaTeX editor"; From de7d8e64cf1895fa3153608295400e3b70a64b5e Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 17 Apr 2016 02:27:26 +0300 Subject: [PATCH 015/103] tiled: move to qmakeHook --- pkgs/applications/editors/tiled/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/editors/tiled/default.nix b/pkgs/applications/editors/tiled/default.nix index 059b85cee5f..e4b2f0461c2 100644 --- a/pkgs/applications/editors/tiled/default.nix +++ b/pkgs/applications/editors/tiled/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, qtbase, qttools, pkgconfig, python }: +{ stdenv, fetchurl, qtbase, qttools, qmakeHook, pkgconfig, python }: let version = "0.12.3"; @@ -13,9 +13,7 @@ stdenv.mkDerivation rec { inherit sha256; }; - buildInputs = [ qtbase qttools pkgconfig python ]; - - preConfigure = "qmake -r PREFIX=$out"; + buildInputs = [ qtbase qttools qmakeHook pkgconfig python ]; meta = { description = "A free, easy to use and flexible tile map editor"; From 62e3430b132397c57b154db3f4c871212a0d813d Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 16 Apr 2016 23:01:16 +0300 Subject: [PATCH 016/103] antimony: move to qmakeHook This reverts commit 9fa8fb1dec426ad79ff67e01f20d831c322d8525. --- pkgs/applications/graphics/antimony/default.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/graphics/antimony/default.nix b/pkgs/applications/graphics/antimony/default.nix index fa9a7e0fdd3..50b33096e3d 100644 --- a/pkgs/applications/graphics/antimony/default.nix +++ b/pkgs/applications/graphics/antimony/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, libpng, python3, boost, mesa, qtbase, ncurses }: +{ stdenv, fetchgit, libpng, python3, boost, mesa, qtbase, qmakeHook, ncurses }: let gitRev = "745eca3a2d2657c495d5509e9083c884e021d09c"; @@ -31,16 +31,14 @@ in mesa qtbase ncurses ]; - configurePhase = '' - runHook preConfigure + nativeBuildHooks = [ qmakeHook ]; + + preConfigure = '' export GITREV=${gitRev} export GITBRANCH=${gitBranch} export GITTAG=${gitTag} cd qt - export sourceRoot=$sourceRoot/qt - qmake antimony.pro PREFIX=$out - runHook postConfigure ''; enableParallelBuilding = true; From b0c5221ce3bd0196f17d57e70e9f3205fb0c6c3e Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 17 Apr 2016 02:28:56 +0300 Subject: [PATCH 017/103] awesomebump: move to qmakeHook --- pkgs/applications/graphics/awesomebump/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/graphics/awesomebump/default.nix b/pkgs/applications/graphics/awesomebump/default.nix index c71b1f9335b..b89e18ed148 100644 --- a/pkgs/applications/graphics/awesomebump/default.nix +++ b/pkgs/applications/graphics/awesomebump/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, qtbase, makeWrapper }: +{ lib, stdenv, fetchurl, qtbase, qmakeHook, makeWrapper }: stdenv.mkDerivation { name = "awesomebump-4.0"; @@ -10,9 +10,7 @@ stdenv.mkDerivation { setSourceRoot = "sourceRoot=$(echo */Sources)"; - buildInputs = [ qtbase makeWrapper ]; - - preBuild = "qmake"; + buildInputs = [ qtbase qmakeHook makeWrapper ]; enableParallelBuilding = true; From 7b08f65f57296ba9c16aaa428bed86677f53cfd6 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 17 Apr 2016 02:29:11 +0300 Subject: [PATCH 018/103] leocad: move to qmake4Hook --- pkgs/applications/graphics/leocad/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/graphics/leocad/default.nix b/pkgs/applications/graphics/leocad/default.nix index 9ca9c592102..884dc115853 100644 --- a/pkgs/applications/graphics/leocad/default.nix +++ b/pkgs/applications/graphics/leocad/default.nix @@ -3,7 +3,7 @@ To use aditional parts libraries set the variable LEOCAD_LIB=/path/to/libs/ or use option -l /path/to/libs/ */ -{ stdenv, fetchsvn, qt4, zlib }: +{ stdenv, fetchsvn, qt4, qmake4Hook, zlib }: stdenv.mkDerivation rec { name = "leocad-${version}"; @@ -14,12 +14,11 @@ stdenv.mkDerivation rec { sha256 = "1190gb437ls51hhfiwa79fq131026kywpy3j3k4fkdgfr8a9v3q8"; }; - buildInputs = [ qt4 zlib ]; + buildInputs = [ qt4 qmake4Hook zlib ]; - prefixKey = "INSTALL_PREFIX="; - configureScript = "qmake leocad.pro"; postPatch = '' substituteInPlace common/camera.cpp --replace "isnan(" "std::isnan(" + export qmakeFlags="$qmakeFlags INSTALL_PREFIX=$out" ''; meta = with stdenv.lib; { From 2a7a4ec079405c01b0e504aaacff1cdd52637789 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 17 Apr 2016 02:29:52 +0300 Subject: [PATCH 019/103] meshlab: use system vcg --- pkgs/applications/graphics/meshlab/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/graphics/meshlab/default.nix b/pkgs/applications/graphics/meshlab/default.nix index 49bfb47c85a..d8434de5a77 100644 --- a/pkgs/applications/graphics/meshlab/default.nix +++ b/pkgs/applications/graphics/meshlab/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, qt4, bzip2, lib3ds, levmar, muparser, unzip}: +{ stdenv, fetchurl, qt4, bzip2, lib3ds, levmar, muparser, unzip, vcg }: stdenv.mkDerivation rec { name = "meshlab-1.3.3"; @@ -16,8 +16,6 @@ stdenv.mkDerivation rec { buildPhase = '' mkdir -p "$out/include" - cp -r vcglib "$out/include" - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$out/include/vcglib" export NIX_LDFLAGS="-rpath $out/opt/meshlab $NIX_LDFLAGS" cd meshlab/src pushd external @@ -38,7 +36,7 @@ stdenv.mkDerivation rec { sourceRoot = "."; - buildInputs = [ qt4 unzip ]; + buildInputs = [ qt4 unzip vcg ]; meta = { description = "System for the processing and editing of unstructured 3D triangular meshes"; From 0b6a6c903ea89e3883faca30c2a8b9cbef225505 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 17 Apr 2016 02:30:06 +0300 Subject: [PATCH 020/103] openscad: move to qmake4Hook --- pkgs/applications/graphics/openscad/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/graphics/openscad/default.nix b/pkgs/applications/graphics/openscad/default.nix index 7557e19896f..f3b16a30460 100644 --- a/pkgs/applications/graphics/openscad/default.nix +++ b/pkgs/applications/graphics/openscad/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, qt4, bison, flex, eigen, boost, mesa, glew, opencsg, cgal +{ stdenv, fetchurl, qt4, qmake4Hook, bison, flex, eigen, boost, mesa, glew, opencsg, cgal , mpfr, gmp, glib, pkgconfig, harfbuzz, qscintilla, gettext }: @@ -12,13 +12,11 @@ stdenv.mkDerivation rec { }; buildInputs = [ - qt4 bison flex eigen boost mesa glew opencsg cgal mpfr gmp glib + qt4 qmake4Hook bison flex eigen boost mesa glew opencsg cgal mpfr gmp glib pkgconfig harfbuzz qscintilla gettext ]; - configurePhase = '' - qmake PREFIX="$out" VERSION=${version} - ''; + qmakeFlags = [ "VERSION=${version}" ]; doCheck = false; From 6dc6a549c87c43d780b96c100a9ddf4573a44e10 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 16 Apr 2016 22:59:19 +0300 Subject: [PATCH 021/103] phototonic: move to qmakeHook This reverts commit a0dd8d5afed35629c1055661d9262c64fc472402. --- pkgs/applications/graphics/phototonic/default.nix | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/graphics/phototonic/default.nix b/pkgs/applications/graphics/phototonic/default.nix index 4ed3a424031..4782376d1e0 100644 --- a/pkgs/applications/graphics/phototonic/default.nix +++ b/pkgs/applications/graphics/phototonic/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, qtbase, exiv2 }: +{ stdenv, fetchFromGitHub, qtbase, qmakeHook, exiv2 }: stdenv.mkDerivation rec { name = "phototonic-${version}"; @@ -14,16 +14,12 @@ stdenv.mkDerivation rec { }; buildInputs = [ qtbase exiv2 ]; + nativeBuildInputs = [ qmakeHook ]; - configurePhase = '' - runHook preConfigure - sed -i 's;/usr;;' phototonic.pro - qmake PREFIX="" - runHook postConfigure + preConfigure = '' + sed -i 's;/usr;$$PREFIX/;g' phototonic.pro ''; - installFlags = [ "INSTALL_ROOT=$(out)" ]; - meta = with stdenv.lib; { description = "An image viewer and organizer"; homepage = http://oferkv.github.io/phototonic/; From 0ca9ad08b4b0c9167d405288db6acdb790b2ac19 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 17 Apr 2016 02:30:33 +0300 Subject: [PATCH 022/103] qtpfsgui: move to qmake4Hook --- pkgs/applications/graphics/qtpfsgui/default.nix | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/graphics/qtpfsgui/default.nix b/pkgs/applications/graphics/qtpfsgui/default.nix index efa245cc7e9..5223ae14c63 100644 --- a/pkgs/applications/graphics/qtpfsgui/default.nix +++ b/pkgs/applications/graphics/qtpfsgui/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, qt4, exiv2, openexr, fftwSinglePrec, libtiff, ilmbase }: +{stdenv, fetchurl, qt4, qmake4Hook, exiv2, openexr, fftwSinglePrec, libtiff, ilmbase }: stdenv.mkDerivation rec { name = "qtpfsgui-1.9.3"; @@ -9,15 +9,19 @@ stdenv.mkDerivation rec { }; buildInputs = [ qt4 exiv2 openexr fftwSinglePrec libtiff ]; + nativeBuildInputs = [ qmake4Hook ]; - configurePhase = '' + preConfigure = '' export CPATH="${ilmbase}/include/OpenEXR:$CPATH" - qmake PREFIX=$out EXIV2PATH=${exiv2}/include/exiv2 \ - OPENEXRDIR=${openexr}/include/OpenEXR \ - FFTW3DIR=${fftwSinglePrec}/include \ - LIBTIFFDIR=${libtiff}/include ''; + qmakeFlags = [ + "EXIV2PATH=${exiv2}/include/exiv2" + "OPENEXRDIR=${openexr}/include/OpenEXR" + "FFTW3DIR=${fftwSinglePrec}/include" + "LIBTIFFDIR=${libtiff}/include" + ]; + meta = { homepage = http://qtpfsgui.sourceforge.net/; description = "Qtpfsqui, a graphical application for high dynamic range (HDR) imaging"; From 6995d0193920685294f97f2b79e3c39b14e985ae Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 16 Apr 2016 22:59:19 +0300 Subject: [PATCH 023/103] rapcad: move to qmakeHook This reverts commit 38d5c07b1447e807ab4723a271cbfcfece22c3df. --- pkgs/applications/graphics/rapcad/default.nix | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/graphics/rapcad/default.nix b/pkgs/applications/graphics/rapcad/default.nix index 90cb360e7d5..d5d6e27219f 100644 --- a/pkgs/applications/graphics/rapcad/default.nix +++ b/pkgs/applications/graphics/rapcad/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchgit, cgal, boost, gmp, mpfr, flex, bison, dxflib, readline -, qtbase +, qtbase, qmakeHook, mesa_glu }: stdenv.mkDerivation rec { @@ -12,14 +12,7 @@ stdenv.mkDerivation rec { sha256 = "15c18jvgbwyrfhv7r35ih0gzx35vjlsbi984h1sckgh2z17hjq8l"; }; - buildInputs = [ qtbase cgal boost gmp mpfr flex bison dxflib readline ]; - - configurePhase = '' - runHook preConfigure - qmake - sed -e "s@/usr/@$out/@g" -i $(find . -name Makefile) - runHook postConfigure - ''; + buildInputs = [ qtbase qmakeHook cgal boost gmp mpfr flex bison dxflib readline mesa_glu ]; meta = { license = stdenv.lib.licenses.gpl3; From 1237d0b8208c41b11b0fd60fa7cf90b903d764b9 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 16 Apr 2016 22:59:20 +0300 Subject: [PATCH 024/103] cool-retro-term: move to qmakeHook This reverts commit 44a2ca4a34ceb49b339ed8828d1ce6c5ecd493af. --- pkgs/applications/misc/cool-retro-term/default.nix | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/misc/cool-retro-term/default.nix b/pkgs/applications/misc/cool-retro-term/default.nix index 67b9b601139..9ffa36adc12 100644 --- a/pkgs/applications/misc/cool-retro-term/default.nix +++ b/pkgs/applications/misc/cool-retro-term/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchgit, makeQtWrapper, qtbase, qtquick1, qmltermwidget, -qtquickcontrols, qtgraphicaleffects }: +qtquickcontrols, qtgraphicaleffects, qmakeHook }: stdenv.mkDerivation rec { version = "1.0.0"; @@ -17,15 +17,9 @@ stdenv.mkDerivation rec { ''; buildInputs = [ qtbase qtquick1 qmltermwidget qtquickcontrols qtgraphicaleffects ]; - nativeBuildInputs = [ makeQtWrapper ]; + nativeBuildInputs = [ makeQtWrapper qmakeHook ]; - configurePhase = '' - runHook preConfigure - qmake PREFIX=$out - runHook postConfigure - ''; - - installPhase = "make -j $NIX_BUILD_CORES INSTALL_ROOT=$out install"; + installFlags = [ "INSTALL_ROOT=$(out)" ]; preFixup = '' mv $out/usr/share $out/share From c6e6944b95900bb6ada78e1d25d3aebe40c9b751 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 17 Apr 2016 02:31:25 +0300 Subject: [PATCH 025/103] diffpdf: move to qmake4Hook --- pkgs/applications/misc/diffpdf/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/diffpdf/default.nix b/pkgs/applications/misc/diffpdf/default.nix index aefa4f755b8..666c3a40cdc 100644 --- a/pkgs/applications/misc/diffpdf/default.nix +++ b/pkgs/applications/misc/diffpdf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, qt4, poppler_qt4 }: +{ stdenv, fetchurl, qt4, poppler_qt4, qmake4Hook }: stdenv.mkDerivation rec { version = "2.1.3"; @@ -12,13 +12,12 @@ stdenv.mkDerivation rec { patches = [ ./fix_path_poppler_qt4.patch ]; buildInputs = [ qt4 poppler_qt4 ]; + nativeBuildInputs = [ qmake4Hook ]; - preBuild = '' + preConfigure = '' substituteInPlace diffpdf.pro --replace @@NIX_POPPLER_QT4@@ ${poppler_qt4} - [ -e "*.qm" ] && make clean lrelease diffpdf.pro - qmake -makefile PREFIX=\$out - ''; + ''; installPhase = '' mkdir -p $out/bin $out/share/man/man1 From 222950f39b2a28faf86b072dc83a7a897ef31d34 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 17 Apr 2016 02:31:33 +0300 Subject: [PATCH 026/103] evopedia: move to qmake4Hook --- pkgs/applications/misc/evopedia/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/evopedia/default.nix b/pkgs/applications/misc/evopedia/default.nix index b7403d4826b..b235da697d5 100644 --- a/pkgs/applications/misc/evopedia/default.nix +++ b/pkgs/applications/misc/evopedia/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchgit, bzip2, qt4, libX11}: +{ stdenv, fetchgit, bzip2, qt4, qmake4Hook, libX11 }: stdenv.mkDerivation rec { name = "evopedia-${version}"; @@ -10,11 +10,8 @@ stdenv.mkDerivation rec { sha256 = "1biq9zaj8nhxx1pixidsn97iwp9qy1yslgl0znpa4d4p35jcg48g"; }; - configurePhase = '' - qmake PREFIX=$out - ''; - buildInputs = [ bzip2 qt4 libX11 ]; + nativeBuildInputs = [ qmake4Hook ]; meta = { description = "Offline Wikipedia Viewer"; From b6016fb6dfac2404a4856d5724665c3d4f00ee3e Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 17 Apr 2016 02:31:57 +0300 Subject: [PATCH 027/103] freicoin: move to qmake4Hook --- pkgs/applications/misc/freicoin/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/freicoin/default.nix b/pkgs/applications/misc/freicoin/default.nix index 65265fc07a5..b4e71d4bbc7 100644 --- a/pkgs/applications/misc/freicoin/default.nix +++ b/pkgs/applications/misc/freicoin/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, db, boost, gmp, mpfr, miniupnpc, qt4, unzip }: +{ fetchurl, stdenv, db, boost, gmp, mpfr, miniupnpc, qt4, qmake4Hook, unzip }: stdenv.mkDerivation rec { version = "0.8.3-1"; @@ -11,9 +11,7 @@ stdenv.mkDerivation rec { # I think that openssl and zlib are required, but come through other # packages - buildInputs = [ db boost gmp mpfr miniupnpc qt4 unzip ]; - - configurePhase = "qmake"; + buildInputs = [ db boost gmp mpfr miniupnpc qt4 unzip qmake4Hook ]; installPhase = '' mkdir -p $out/bin From b6717f466be7d12f34d70299fa9b2fed83104814 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 17 Apr 2016 02:32:05 +0300 Subject: [PATCH 028/103] goldendict: move to qmake4Hook --- pkgs/applications/misc/goldendict/default.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/goldendict/default.nix b/pkgs/applications/misc/goldendict/default.nix index 9a7fad6a207..36840c656d3 100644 --- a/pkgs/applications/misc/goldendict/default.nix +++ b/pkgs/applications/misc/goldendict/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchFromGitHub, pkgconfig, qt4, libXtst, libvorbis, hunspell, libao, ffmpeg, libeb, lzo, xz, libtiff }: +{ stdenv, fetchFromGitHub, pkgconfig, qt4, qmake4Hook, libXtst, libvorbis, hunspell +, libao, ffmpeg, libeb, lzo, xz, libtiff }: stdenv.mkDerivation rec { name = "goldendict-1.5.0.ec86515"; src = fetchFromGitHub { @@ -8,10 +9,12 @@ stdenv.mkDerivation rec { sha256 = "070majwxbn15cy7sbgz7ljl8rkn7vcgkm10884v97csln7bfzwhr"; }; - buildInputs = [ pkgconfig qt4 libXtst libvorbis hunspell libao ffmpeg libeb lzo xz libtiff ]; - configurePhase = '' - qmake PREFIX=$out 'CONFIG+=zim_support' - ''; + buildInputs = [ + pkgconfig qt4 libXtst libvorbis hunspell libao ffmpeg libeb + lzo xz libtiff qmake4Hook + ]; + + qmakeFlags = [ "CONFIG+=zim_support" ]; meta = { homepage = http://goldendict.org/; From f02e4a72552a346cc309205d20d38f3577839774 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 17 Apr 2016 02:32:55 +0300 Subject: [PATCH 029/103] gqrx: move to qmake4Hook --- pkgs/applications/misc/gqrx/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/gqrx/default.nix b/pkgs/applications/misc/gqrx/default.nix index d30b6b8e8f9..3fda4d8881a 100644 --- a/pkgs/applications/misc/gqrx/default.nix +++ b/pkgs/applications/misc/gqrx/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, qt4, gnuradio, boost, gnuradio-osmosdr +{ stdenv, fetchFromGitHub, qt4, qmake4Hook, gnuradio, boost, gnuradio-osmosdr # drivers (optional): , rtl-sdr, hackrf , pulseaudioSupport ? true, libpulseaudio @@ -17,12 +17,12 @@ stdenv.mkDerivation rec { sha256 = "02pavd1kc0gsnrl18bfa01r2f3j4j05zly4a8zwss9yrsgf8432x"; }; + nativeBuildInputs = [ qmake4Hook ]; + buildInputs = [ qt4 gnuradio boost gnuradio-osmosdr rtl-sdr hackrf ] ++ stdenv.lib.optionals pulseaudioSupport [ libpulseaudio ]; - configurePhase = ''qmake PREFIX="$out"''; - enableParallelBuilding = true; postInstall = '' From 7a57ce0fbb2bc8c23a2a1a7126d770fdf57b8b48 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 17 Apr 2016 02:33:06 +0300 Subject: [PATCH 030/103] keepassx: move to qmake4Hook --- pkgs/applications/misc/keepassx/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/keepassx/default.nix b/pkgs/applications/misc/keepassx/default.nix index 3d078d59be6..d0bddbc1610 100644 --- a/pkgs/applications/misc/keepassx/default.nix +++ b/pkgs/applications/misc/keepassx/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, bzip2, qt4, libX11, xextproto, libXtst }: +{ stdenv, fetchurl, bzip2, qt4, qmake4Hook, libX11, xextproto, libXtst }: stdenv.mkDerivation rec { name = "keepassx-${version}"; @@ -9,14 +9,12 @@ stdenv.mkDerivation rec { sha256 = "1i5dq10x28mg7m4c0yacm32xfj4j7imir4ph8x9p0s2ym260c9ry"; }; - configurePhase = '' - qmake PREFIX=$out - ''; - patches = [ ./random.patch ]; buildInputs = [ bzip2 qt4 libX11 xextproto libXtst ]; + nativeBuildInputs = [ qmake4Hook ]; + meta = { description = "Qt password manager compatible with its Win32 and Pocket PC versions"; homepage = http://www.keepassx.org/; From eb386da6da15cce5c37c2c130731130ef81c98b4 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 17 Apr 2016 02:33:19 +0300 Subject: [PATCH 031/103] librecad: move to qmake4Hook --- pkgs/applications/misc/librecad/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/librecad/default.nix b/pkgs/applications/misc/librecad/default.nix index b41ef70394e..d5c04ba555a 100644 --- a/pkgs/applications/misc/librecad/default.nix +++ b/pkgs/applications/misc/librecad/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, qt4, muparser, which, boost, pkgconfig }: +{ stdenv, fetchurl, qt4, qmake4Hook, muparser, which, boost, pkgconfig }: stdenv.mkDerivation rec { version = "2.0.9"; @@ -15,9 +15,7 @@ stdenv.mkDerivation rec { sed -i -e s,/usr/share,$out/share, librecad/src/lib/engine/rs_system.cpp ''; - configurePhase = '' - qmake librecad.pro PREFIX=$out MUPARSER_DIR=${muparser} BOOST_DIR=${boost.dev} - ''; + qmakeFlags = [ "MUPARSER_DIR=${muparser}" "BOOST_DIR=${boost.dev}" ]; installPhase = '' mkdir -p $out/bin $out/share @@ -26,7 +24,7 @@ stdenv.mkDerivation rec { ''; buildInputs = [ qt4 muparser which boost ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig qmake4Hook ]; enableParallelBuilding = true; From b9d23f492b6c9cd5d1499e88cfe458026dab05ec Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 17 Apr 2016 02:33:35 +0300 Subject: [PATCH 032/103] merkaartor: move to qmake4Hook --- pkgs/applications/misc/merkaartor/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/merkaartor/default.nix b/pkgs/applications/misc/merkaartor/default.nix index a270dca910c..5954316e50f 100644 --- a/pkgs/applications/misc/merkaartor/default.nix +++ b/pkgs/applications/misc/merkaartor/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, qt4, boost, proj, gdal_1_11}: +{ stdenv, fetchurl, qt4, qmake4Hook, boost, proj, gdal_1_11 }: stdenv.mkDerivation rec { name = "merkaartor-0.18.1"; @@ -7,12 +7,10 @@ stdenv.mkDerivation rec { sha256 = "17qk45pmlxqigla1915dvn9pp91y85d2bkcaap4g3m8mk1crcsix"; }; - configurePhase = '' - qmake -makefile PREFIX=$out - ''; - buildInputs = [ qt4 boost proj gdal_1_11 ]; + nativeBuildInputs = [ qmake4Hook ]; + meta = { description = "An openstreetmap editor"; homepage = http://merkaartor.org/; From fbb92639810632efaead4013d387651ce0cb6fb4 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 17 Apr 2016 02:33:50 +0300 Subject: [PATCH 033/103] multimon-ng: move to qmake4Hook --- pkgs/applications/misc/multimon-ng/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/multimon-ng/default.nix b/pkgs/applications/misc/multimon-ng/default.nix index f9aa567ed4b..a9f0cb2511a 100644 --- a/pkgs/applications/misc/multimon-ng/default.nix +++ b/pkgs/applications/misc/multimon-ng/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, qt4, libpulseaudio }: +{ stdenv, fetchFromGitHub, qt4, qmake4Hook, libpulseaudio }: let version = "1.0.0"; in @@ -14,7 +14,7 @@ stdenv.mkDerivation { buildInputs = [ qt4 libpulseaudio ]; - preBuild = "qmake multimon-ng.pro"; + nativeBuildInputs = [ qmake4Hook ]; installPhase = '' mkdir -p $out/bin From e9e112817d70eee0d17919b2af7cf39b9c806446 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 17 Apr 2016 02:34:13 +0300 Subject: [PATCH 034/103] navipowm: move to qmake4Hook --- pkgs/applications/misc/navipowm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/navipowm/default.nix b/pkgs/applications/misc/navipowm/default.nix index 6d990831a36..447fc4570a7 100644 --- a/pkgs/applications/misc/navipowm/default.nix +++ b/pkgs/applications/misc/navipowm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, qt4 }: +{ stdenv, fetchurl, qt4, qmake4Hook }: stdenv.mkDerivation rec { name = "navipowm-0.2.4"; @@ -7,9 +7,8 @@ stdenv.mkDerivation rec { sha256 = "1kdih8kwpgcgfh6l6njkr9gq2j5hv39xvzmzgvhip553kn6bss7b"; }; - configurePhase = '' + preConfigure = '' cd Qt/KDevelop - qmake ''; installPhase = '' @@ -20,6 +19,7 @@ stdenv.mkDerivation rec { ''; buildInputs = [ qt4 ]; + nativeBuildInputs = [ qmake4Hook ]; meta = { homepage = http://navipowm.sourceforge.net/; From 4e1d2d9afb34cc2bf4cb14a4262848c1f24279a4 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 17 Apr 2016 02:34:22 +0300 Subject: [PATCH 035/103] openbrf: move to qmake4Hook --- pkgs/applications/misc/openbrf/default.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/misc/openbrf/default.nix b/pkgs/applications/misc/openbrf/default.nix index 478f02b970e..70be67a4d28 100644 --- a/pkgs/applications/misc/openbrf/default.nix +++ b/pkgs/applications/misc/openbrf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, qt4, vcg, glew }: +{ stdenv, fetchFromGitHub, qt4, qmake4Hook, vcg, glew }: stdenv.mkDerivation { name = "openbrf-2016-01-09"; @@ -10,18 +10,16 @@ stdenv.mkDerivation { sha256 = "0laikpz0ljz7l5fgapwj09ygizmvj1iywnpfgfd0i14j46s134xb"; }; - buildInputs = [ qt4 vcg glew ]; + buildInputs = [ qt4 qmake4Hook vcg glew ]; enableParallelBuilding = true; + qmakeFlags = [ "openBrf.pro" ]; + postPatch = '' sed -i 's,^VCGLIB .*,VCGLIB = ${vcg}/include,' openBrf.pro ''; - configurePhase = '' - qmake PREFIX=$out openBrf.pro - ''; - installPhase = '' install -Dm755 openBrf $out/bin/openBrf ''; From eeffa2202a6652e67a3fa2c6ba1234b2e963d530 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 17 Apr 2016 02:34:33 +0300 Subject: [PATCH 036/103] qtbitcointrader: move to qmake4Hook --- .../applications/misc/qtbitcointrader/default.nix | 15 ++++++++------- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/misc/qtbitcointrader/default.nix b/pkgs/applications/misc/qtbitcointrader/default.nix index 8b527463b22..7de4e3e55a1 100644 --- a/pkgs/applications/misc/qtbitcointrader/default.nix +++ b/pkgs/applications/misc/qtbitcointrader/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, qt }: +{ stdenv, fetchFromGitHub, qt4, qmake4Hook }: let version = "1.08.03"; @@ -13,23 +13,24 @@ stdenv.mkDerivation { sha256 = "0kxb0n11agqid0nyqdspfndm03b8l0nl8x4yx2hsrizs6m5z08h4"; }; - buildInputs = [ qt ]; + buildInputs = [ qt4 ]; + + nativeBuildHooks = [ qmake4Hook ]; postUnpack = "sourceRoot=\${sourceRoot}/src"; - configurePhase = '' - qmake \ - PREFIX=$out \ + preConfigure = '' + qmakeFlags="$qmakeFlags \ DESKTOPDIR=$out/share/applications \ ICONDIR=$out/share/pixmaps \ - QtBitcoinTrader_Desktop.pro + " ''; meta = with stdenv.lib; { description = "Secure bitcoin trading client"; homepage = https://centrabit.com/; license = licenses.lgpl3; - platforms = qt.meta.platforms; + platforms = qt4.meta.platforms; maintainers = [ maintainers.ehmry ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 90d766c925a..7ed4d8859c7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14584,9 +14584,7 @@ in qgroundcontrol = qt55.callPackage ../applications/science/robotics/qgroundcontrol { }; - qtbitcointrader = callPackage ../applications/misc/qtbitcointrader { - qt = qt4; - }; + qtbitcointrader = callPackage ../applications/misc/qtbitcointrader { }; pahole = callPackage ../development/tools/misc/pahole {}; From f3384e5ea9fbef6eeaad3f1046c1193d81dd2b05 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 16 Apr 2016 22:59:19 +0300 Subject: [PATCH 037/103] qtpass: move to qmakeHook This reverts commit 0cfff33f59131ec124b0e1c0de2a8a69ef4af896. --- pkgs/applications/misc/qtpass/default.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/misc/qtpass/default.nix b/pkgs/applications/misc/qtpass/default.nix index 69730759d08..15f249ac906 100644 --- a/pkgs/applications/misc/qtpass/default.nix +++ b/pkgs/applications/misc/qtpass/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, git, gnupg, makeQtWrapper, pass, qtbase, qtsvg, qttools }: +{ stdenv, fetchurl, git, gnupg, makeQtWrapper, pass, qtbase, qtsvg, qttools, qmakeHook }: stdenv.mkDerivation rec { name = "qtpass-${version}"; @@ -9,12 +9,10 @@ stdenv.mkDerivation rec { sha256 = "60b458062f54184057e55dbd9c93958a8bf845244ffd70b9cb31bf58697f0dc6"; }; - buildInputs = [ git gnupg makeQtWrapper pass qtbase qtsvg qttools ]; + buildInputs = [ git gnupg makeQtWrapper pass qtbase qtsvg qttools qmakeHook ]; - configurePhase = '' - runHook preConfigure - qmake CONFIG+=release PREFIX=$out DESTDIR=$out - runHook postConfigure + preConfigure = '' + qmakeFlags="$qmakeFlags CONFIG+=release DESTDIR=$out" ''; installPhase = '' From bc428f9429d0b5ac31e99cc190195749070945fd Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 17 Apr 2016 02:34:52 +0300 Subject: [PATCH 038/103] tpmmanager: move to qmake4Hook --- pkgs/applications/misc/tpmmanager/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/tpmmanager/default.nix b/pkgs/applications/misc/tpmmanager/default.nix index 85a1c72b349..09322b47506 100644 --- a/pkgs/applications/misc/tpmmanager/default.nix +++ b/pkgs/applications/misc/tpmmanager/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, qt4, trousers }: +{ stdenv, fetchgit, qt4, qmake4Hook, trousers }: stdenv.mkDerivation rec { version = "0.8.1"; @@ -10,11 +10,9 @@ stdenv.mkDerivation rec { sha256 = "24a606f88fed67ed0d0e61dc220295e9e1ab8db3ef3d028fa34b04ff30652d8e"; }; - buildInputs = [ qt4 trousers ]; + nativeBuildInputs = [ qmake4Hook ]; - preBuild = '' - qmake -makefile PREFIX=\$out - ''; + buildInputs = [ qt4 trousers ]; installPhase = '' mkdir -p $out/bin From 9f3368e52d1fa1445fa88b07df7b0961b00413eb Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 16 Apr 2016 22:59:18 +0300 Subject: [PATCH 039/103] twmn: move to qmakeHook This reverts commit fab7c7edbf5ad756b60c975dd6c4fd0362719e13. --- pkgs/applications/misc/twmn/default.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/misc/twmn/default.nix b/pkgs/applications/misc/twmn/default.nix index fbbf45877d2..665e23237d8 100644 --- a/pkgs/applications/misc/twmn/default.nix +++ b/pkgs/applications/misc/twmn/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, fetchgit, qtbase, qtx11extras, pkgconfig, boost }: +{ fetchurl, stdenv, fetchgit, qtbase, qtx11extras, qmakeHook, pkgconfig, boost }: stdenv.mkDerivation rec { name = "twmn-git-2014-09-23"; @@ -9,13 +9,10 @@ stdenv.mkDerivation rec { sha256 = "9c91e9d3d6d7f9d90d34da6f1a4b9f3dee65605c1e43729417d6921c54dded6b"; }; - buildInputs = [ qtbase qtx11extras pkgconfig boost ]; + buildInputs = [ qtbase qtx11extras pkgconfig boost qmakeHook ]; - configurePhase = '' - runHook preConfigure + postPatch = '' sed -i s/-Werror// twmnd/twmnd.pro - qmake - runHook postConfigure ''; installPhase = '' From 23e3372feafc40a389aa19852a8c2e56aac542c9 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 17 Apr 2016 02:35:11 +0300 Subject: [PATCH 040/103] vym: move to qmake4Hook --- pkgs/applications/misc/vym/default.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/misc/vym/default.nix b/pkgs/applications/misc/vym/default.nix index 62f741f9eea..97fa47399f5 100644 --- a/pkgs/applications/misc/vym/default.nix +++ b/pkgs/applications/misc/vym/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, qt4 }: +{ stdenv, fetchurl, pkgconfig, qt4, qmake4Hook }: stdenv.mkDerivation rec { name = "vym-${version}"; @@ -9,11 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1x4qp6wpszscbbs4czkfvskm7qjglvxm813nqv281bpy4y1hhvgs"; }; - buildInputs = [ pkgconfig qt4 ]; - - configurePhase = '' - qmake PREFIX="$out" - ''; + buildInputs = [ pkgconfig qt4 qmake4Hook ]; meta = with stdenv.lib; { description = "A mind-mapping software"; From bab152826fee66f0518660067198a77e41ac9af7 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 17 Apr 2016 02:35:18 +0300 Subject: [PATCH 041/103] arora: move to qmake4Hook --- pkgs/applications/networking/browsers/arora/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/arora/default.nix b/pkgs/applications/networking/browsers/arora/default.nix index d812078b6aa..8bcefe4fe7b 100644 --- a/pkgs/applications/networking/browsers/arora/default.nix +++ b/pkgs/applications/networking/browsers/arora/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, qt4 }: +{ stdenv, fetchurl, qt4, qmake4Hook }: stdenv.mkDerivation rec { name = "arora-${version}"; @@ -10,8 +10,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ qt4 ]; - - configurePhase = "qmake PREFIX=$out"; + nativeBuildInputs = [ qmake4Hook ]; meta = with stdenv.lib; { platforms = qt4.meta.platforms; From 87397b770c4b9dbd2faef8c6c2df021048c2aa83 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 17 Apr 2016 02:35:28 +0300 Subject: [PATCH 042/103] qtox: move to qmakeHook --- .../instant-messengers/qtox/default.nix | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/qtox/default.nix b/pkgs/applications/networking/instant-messengers/qtox/default.nix index e08a112664a..d244c4d11c4 100644 --- a/pkgs/applications/networking/instant-messengers/qtox/default.nix +++ b/pkgs/applications/networking/instant-messengers/qtox/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, pkgconfig, libtoxcore-dev, openal, opencv, libsodium, libXScrnSaver, glib, gdk_pixbuf, gtk2, cairo, - pango, atk, qrencode, ffmpeg, filter-audio, makeWrapper, - qtbase, qtsvg, qttools, qttranslations, sqlcipher }: + pango, atk, qrencode, ffmpeg, filter-audio, makeQtWrapper, + qtbase, qtsvg, qttools, qmakeHook, qttranslations, sqlcipher }: let version = "1.3.0"; @@ -22,11 +22,11 @@ stdenv.mkDerivation rec { [ libtoxcore-dev openal opencv libsodium filter-audio qtbase qttools qtsvg libXScrnSaver glib gtk2 cairo - pango atk qrencode ffmpeg qttranslations makeWrapper + pango atk qrencode ffmpeg qttranslations makeQtWrapper sqlcipher ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig qmakeHook ]; preConfigure = '' # patch .pro file for proper set of the git hash @@ -42,16 +42,10 @@ stdenv.mkDerivation rec { export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags sqlcipher)" ''; - configurePhase = '' - runHook preConfigure - qmake - ''; - installPhase = '' mkdir -p $out/bin cp qtox $out/bin - wrapProgram $out/bin/qtox \ - --prefix QT_PLUGIN_PATH : ${qtsvg}/lib/qt5/plugins + wrapQtProgram $out/bin/qtox ''; enableParallelBuilding = true; From 46cf871c3d40ec8f7774302e3e2cb7c9c371053c Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 17 Apr 2016 02:35:53 +0300 Subject: [PATCH 043/103] ricochet: move to qmakeHook --- .../networking/instant-messengers/ricochet/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/ricochet/default.nix b/pkgs/applications/networking/instant-messengers/ricochet/default.nix index 81e8d1b76a9..52da021000d 100644 --- a/pkgs/applications/networking/instant-messengers/ricochet/default.nix +++ b/pkgs/applications/networking/instant-messengers/ricochet/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, makeDesktopItem, unzip , qtbase, qttools, makeQtWrapper, qtmultimedia, qtquick1, qtquickcontrols -, openssl, protobuf +, openssl, protobuf, qmakeHook }: stdenv.mkDerivation rec { @@ -27,15 +27,13 @@ stdenv.mkDerivation rec { openssl protobuf ]; - nativeBuildInputs = [ pkgconfig makeQtWrapper ]; + nativeBuildInputs = [ pkgconfig makeQtWrapper qmakeHook ]; preConfigure = '' export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags openssl)" ''; - configureScript = "qmake"; - dontAddPrefix = true; - configureFlags = [ "PREFIX=$(out)" "DEFINES+=RICOCHET_NO_PORTABLE" ]; + qmakeFlags = [ "DEFINES+=RICOCHET_NO_PORTABLE" ]; installPhase = '' mkdir -p $out/bin From 5faed29fa8f4c437bbf0d8ecbf045cadecf6e172 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 16 Apr 2016 22:59:20 +0300 Subject: [PATCH 044/103] cutegram: move to qmakeHook This reverts commit 7f4ab1cb72cc4779b91384474b6b23e4744033d1. --- .../instant-messengers/telegram/cutegram/default.nix | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/telegram/cutegram/default.nix b/pkgs/applications/networking/instant-messengers/telegram/cutegram/default.nix index 07bfcf3a03e..bc517cadf52 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/cutegram/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/cutegram/default.nix @@ -3,7 +3,7 @@ , qtimageformats, qtgraphicaleffects , telegram-qml, libqtelegram-aseman-edition , gst_all_1 -, makeQtWrapper }: +, makeQtWrapper, qmakeHook }: stdenv.mkDerivation rec { name = "cutegram-${meta.version}"; @@ -20,16 +20,10 @@ stdenv.mkDerivation rec { telegram-qml libqtelegram-aseman-edition ] ++ (with gst_all_1; [ gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly ]); - nativeBuildInputs = [ makeQtWrapper ]; + nativeBuildInputs = [ makeQtWrapper qmakeHook ]; enableParallelBuilding = true; - configurePhase = '' - runHook preConfigure - qmake -r PREFIX=$out - runHook postConfigure - ''; - fixupPhase = '' wrapQtProgram $out/bin/cutegram \ --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" From 56b63b91b425ed846867959441b07618a0a50406 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 16 Apr 2016 22:59:20 +0300 Subject: [PATCH 045/103] libqtelegram-aseman-edition: move to qmakeHook This reverts commit 080b54d766dbbcdad3cf3998585788510510cefd. --- .../telegram/libqtelegram-aseman-edition/default.nix | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/telegram/libqtelegram-aseman-edition/default.nix b/pkgs/applications/networking/instant-messengers/telegram/libqtelegram-aseman-edition/default.nix index 470724876ed..322c40afc7d 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/libqtelegram-aseman-edition/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/libqtelegram-aseman-edition/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub -, qtbase, qtmultimedia, qtquick1 }: +, qtbase, qtmultimedia, qtquick1, qmakeHook }: stdenv.mkDerivation rec { name = "libqtelegram-aseman-edition-${meta.version}"; @@ -12,6 +12,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ qtbase qtmultimedia qtquick1 ]; + nativeBuildInputs = [ qmakeHook ]; enableParallelBuilding = true; patchPhase = '' @@ -19,12 +20,6 @@ stdenv.mkDerivation rec { substituteInPlace libqtelegram-ae.pro --replace "/\$\$LIB_PATH" "" ''; - configurePhase = '' - runHook preConfigure - qmake -r PREFIX=$out - runHook postConfigure - ''; - meta = with stdenv.lib; { version = "6.1"; description = "A fork of libqtelegram by Aseman, using qmake"; From 82bf15393d1af2cc2ce0309a4774a9f26d1d2571 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 17 Apr 2016 02:36:28 +0300 Subject: [PATCH 046/103] tdesktop: move to qmakeHook --- .../instant-messengers/telegram/tdesktop/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 77a0d9ee0aa..e734ddc5700 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub, fetchgit, qtbase, qtimageformats , breakpad, ffmpeg, openalSoft, openssl, zlib, libexif, lzma, libopus , gtk2, glib, cairo, pango, gdk_pixbuf, atk, libappindicator-gtk2 -, libunity, dee, libdbusmenu-glib, libva +, libunity, dee, libdbusmenu-glib, libva, qmakeHook , pkgconfig, libxcb, xcbutilwm, xcbutilimage, xcbutilkeysyms , libxkbcommon, libpng, libjpeg, freetype, harfbuzz, pcre16 @@ -31,7 +31,7 @@ in stdenv.mkDerivation rec { buildInputs = [ breakpad ffmpeg openalSoft openssl zlib libexif lzma libopus gtk2 glib libappindicator-gtk2 libunity cairo pango gdk_pixbuf atk - dee libdbusmenu-glib libva + dee libdbusmenu-glib libva qmakeHook # Qt dependencies libxcb xcbutilwm xcbutilimage xcbutilkeysyms libxkbcommon libpng libjpeg freetype harfbuzz pcre16 xproto libX11 @@ -73,10 +73,9 @@ in stdenv.mkDerivation rec { qtSrcs = qtbase.srcs ++ [ qtimageformats.src ]; qtPatches = qtbase.patches; - buildCommand = '' - # We don't use nativeBuildInputs to avoid adding system Qt 5 libraries to various paths. - export PATH="${qtbase}/bin:$PATH" + dontUseQmakeConfigure = true; + buildCommand = '' unpackPhase cd "$sourceRoot" patchPhase From a6af80b42102a8879ef72daacbc02d4323948e2a Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 16 Apr 2016 22:59:20 +0300 Subject: [PATCH 047/103] telegram-qml: move to qmakeHook This reverts commit c275fc610e087a416d018cd63ff420d724f0bbc2. --- .../instant-messengers/telegram/telegram-qml/default.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-qml/default.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-qml/default.nix index 5412b0db4d6..854648d9786 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-qml/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-qml/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub -, qtbase, qtmultimedia, qtquick1 +, qtbase, qtmultimedia, qtquick1, qmakeHook , libqtelegram-aseman-edition }: stdenv.mkDerivation rec { @@ -13,6 +13,7 @@ stdenv.mkDerivation rec { }; propagatedBuildInputs = [ qtbase qtmultimedia qtquick1 libqtelegram-aseman-edition ]; + nativeBuildInputs = [ qmakeHook ]; enableParallelBuilding = true; patchPhase = '' @@ -20,11 +21,7 @@ stdenv.mkDerivation rec { substituteInPlace telegramqml.pro --replace "INSTALL_HEADERS_PREFIX/telegramqml" "INSTALL_HEADERS_PREFIX" ''; - configurePhase = '' - runHook preConfigure - qmake -r PREFIX=$out BUILD_MODE+=lib - runHook postConfigure - ''; + qmakeFlags = [ "BUILD_MODE+=lib" ]; meta = with stdenv.lib; { version = "0.9.2"; From 837c573f2718ca18a352f6699b5ff3e3ff133c8f Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 17 Apr 2016 02:36:53 +0300 Subject: [PATCH 048/103] vacuum: move to qmake4Hook --- .../networking/instant-messengers/vacuum/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/vacuum/default.nix b/pkgs/applications/networking/instant-messengers/vacuum/default.nix index d7798273e7c..2b5ce5f4142 100644 --- a/pkgs/applications/networking/instant-messengers/vacuum/default.nix +++ b/pkgs/applications/networking/instant-messengers/vacuum/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl - , qt4, openssl + , qt4, qmake4Hook, openssl , xproto, libX11, libXScrnSaver, scrnsaverproto , xz, zlib }: @@ -16,8 +16,10 @@ stdenv.mkDerivation rec { qt4 openssl xproto libX11 libXScrnSaver scrnsaverproto xz zlib ]; - configurePhase = '' - qmake INSTALL_PREFIX=$out -recursive vacuum.pro + nativeBuildInputs = [ qmake4Hook ]; + + preConfigure = '' + qmakeFlags="$qmakeFlags INSTALL_PREFIX=$out" ''; meta = with stdenv.lib; { From 6b6768f455667f7006bcdaeec9c01293a23b86f7 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 16 Apr 2016 22:59:20 +0300 Subject: [PATCH 049/103] communi: move to qmakeHook This reverts commit 0fefa9939e5db2057d9e6418cb68946ca2a12721. --- .../applications/networking/irc/communi/default.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/networking/irc/communi/default.nix b/pkgs/applications/networking/irc/communi/default.nix index 4d2605acdc9..4a8dc44dbf9 100644 --- a/pkgs/applications/networking/irc/communi/default.nix +++ b/pkgs/applications/networking/irc/communi/default.nix @@ -1,4 +1,4 @@ -{ fetchgit, libcommuni, makeQtWrapper, qt5, stdenv }: +{ fetchgit, libcommuni, makeQtWrapper, qtbase, qmakeHook, stdenv }: stdenv.mkDerivation rec { name = "communi-${version}"; @@ -10,23 +10,22 @@ stdenv.mkDerivation rec { sha256 = "0gk6gck09zb44qfsal7bs4ln2vl9s9x3vfxh7jvfc7mmf7l3sspd"; }; - nativeBuildInputs = [ makeQtWrapper ]; + nativeBuildInputs = [ makeQtWrapper qmakeHook ]; - buildInputs = [ libcommuni qt5.qtbase ]; + buildInputs = [ libcommuni qtbase ]; enableParallelBuild = true; - configurePhase = '' - runHook preConfigure + preConfigure = '' export QMAKEFEATURES=${libcommuni}/features - qmake -r \ + qmakeFlags="$qmakeFlags \ COMMUNI_INSTALL_PREFIX=$out \ COMMUNI_INSTALL_BINS=$out/bin \ COMMUNI_INSTALL_PLUGINS=$out/lib/communi/plugins \ COMMUNI_INSTALL_ICONS=$out/share/icons/hicolor \ COMMUNI_INSTALL_DESKTOP=$out/share/applications \ COMMUNI_INSTALL_THEMES=$out/share/communi/themes - runHook postConfigure + " ''; postInstall = '' From d52c326fd0554442372d501488d28be8c0c57d07 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 16 Apr 2016 22:59:18 +0300 Subject: [PATCH 050/103] linssid: move to qmakeHook This reverts commit cf3f891369655cd30431bd4f2975a46f8adb0167. --- pkgs/applications/networking/linssid/default.nix | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/networking/linssid/default.nix b/pkgs/applications/networking/linssid/default.nix index 4cbc5c8c796..d35c2e100e4 100644 --- a/pkgs/applications/networking/linssid/default.nix +++ b/pkgs/applications/networking/linssid/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, qtbase, qtsvg, pkgconfig, boost, wirelesstools, iw, qwt6 }: +{ stdenv, fetchurl, qtbase, qtsvg, qmakeHook, pkgconfig, boost, wirelesstools, iw, qwt6 }: stdenv.mkDerivation rec { name = "linssid-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "13d35rlcjncd8lx3khkgn9x8is2xjd5fp6ns5xsn3w6l4xj9b4gl"; }; - buildInputs = [ qtbase qtsvg pkgconfig boost qwt6 ]; + buildInputs = [ qtbase qtsvg pkgconfig boost qwt6 qmakeHook ]; patches = [ ./0001-unbundled-qwt.patch ]; @@ -27,12 +27,6 @@ stdenv.mkDerivation rec { rm -fr qwt-lib ''; - configurePhase = '' - runHook preConfigure - qmake linssid.pro - runHook postConfigure - ''; - meta = with stdenv.lib; { description = "Graphical wireless scanning for Linux"; homepage = http://sourceforge.net/projects/linssid/; From 3c52b4253cd468be7af4291a7c2a051e90a49b83 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 17 Apr 2016 02:38:29 +0300 Subject: [PATCH 051/103] mumble: move to qmake{,4}Hook --- pkgs/applications/networking/mumble/default.nix | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix index 646e3dfdd0b..20a32159520 100644 --- a/pkgs/applications/networking/mumble/default.nix +++ b/pkgs/applications/networking/mumble/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchgit, pkgconfig -, qt4, qt5, avahi, boost, libopus, libsndfile, protobuf, speex, libcap +, qt4, qmake4Hook, qt5, avahi, boost, libopus, libsndfile, protobuf, speex, libcap , alsaLib , jackSupport ? false, libjack2 ? null , speechdSupport ? false, speechd ? null @@ -20,13 +20,13 @@ let patches = optional jackSupport ./mumble-jack-support.patch; nativeBuildInputs = [ pkgconfig ] - ++ { qt4 = [ qt4 ]; qt5 = [ qt5.qtbase ]; }."qt${toString source.qtVersion}" + ++ { qt4 = [ qmake4Hook ]; qt5 = [ qt5.qmakeHook ]; }."qt${toString source.qtVersion}" ++ (overrides.nativeBuildInputs or [ ]); buildInputs = [ boost protobuf avahi ] ++ { qt4 = [ qt4 ]; qt5 = [ qt5.qtbase ]; }."qt${toString source.qtVersion}" ++ (overrides.buildInputs or [ ]); - configureFlags = [ + qmakeFlags = [ "CONFIG+=shared" "CONFIG+=no-g15" "CONFIG+=packaged" @@ -39,10 +39,8 @@ let ++ optional jackSupport "CONFIG+=no-oss CONFIG+=no-alsa CONFIG+=jackaudio" ++ (overrides.configureFlags or [ ]); - configurePhase = '' - runHook preConfigure - qmake $configureFlags DEFINES+="PLUGIN_PATH=$out/lib" - runHook postConfigure + preConfigure = '' + qmakeFlags="$qmakeFlags DEFINES+=PLUGIN_PATH=$out/lib" ''; makeFlags = [ "release" ]; From a1fc9606f2ac655408605cc723cd2a3c3317a84c Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 17 Apr 2016 02:38:45 +0300 Subject: [PATCH 052/103] ostrinato: move to qmake4Hook --- pkgs/applications/networking/ostinato/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/ostinato/default.nix b/pkgs/applications/networking/ostinato/default.nix index 1d5986dbfa6..02209645045 100644 --- a/pkgs/applications/networking/ostinato/default.nix +++ b/pkgs/applications/networking/ostinato/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchgit, fetchurl, writeText -, qt4, protobuf, libpcap +, qt4, qmake4Hook, protobuf, libpcap , wireshark, gzip, diffutils, gawk }: @@ -18,10 +18,9 @@ stdenv.mkDerivation rec { buildInputs = [ qt4 protobuf libpcap ]; - patches = [ ./drone_ini.patch ]; + nativeBuildInputs = [ qmake4Hook ]; - configurePhase = "qmake PREFIX=$out" - + stdenv.lib.optionalString stdenv.isDarwin " -spec macx-g++"; + patches = [ ./drone_ini.patch ]; postInstall = '' cat > $out/bin/ostinato.ini < Date: Sun, 17 Apr 2016 02:39:12 +0300 Subject: [PATCH 053/103] retroshare06: move to qmake4Hook --- pkgs/applications/networking/p2p/retroshare/0.6.nix | 10 +++++----- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/networking/p2p/retroshare/0.6.nix b/pkgs/applications/networking/p2p/retroshare/0.6.nix index 020d0017053..67028fb5dec 100644 --- a/pkgs/applications/networking/p2p/retroshare/0.6.nix +++ b/pkgs/applications/networking/p2p/retroshare/0.6.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, qt, libupnp, gpgme, gnome3, glib, libssh, pkgconfig, protobuf, bzip2 +{ stdenv, fetchFromGitHub, cmake, qt4, qmake4Hook, libupnp, gpgme, gnome3, glib, libssh, pkgconfig, protobuf, bzip2 , libXScrnSaver, speex, curl, libxml2, libxslt, sqlcipher, libmicrohttpd, opencv }: stdenv.mkDerivation { @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "189qndkfq9kgv3qi3wx8ivla4j8fxr4iv7c8y9rjrjaz8jwdkn5x"; }; - NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/glib-2.0 -I${glib.dev}/lib/glib-2.0/include -I${libxml2.dev}/include/libxml2 -I${sqlcipher}/include/sqlcipher"; + NIX_CFLAGS_COMPILE = [ "-I${glib.dev}/include/glib-2.0" "-I${glib.dev}/lib/glib-2.0/include" "-I${libxml2.dev}/include/libxml2" "-I${sqlcipher}/include/sqlcipher" ]; patchPhase = '' # Fix build error @@ -29,11 +29,11 @@ stdenv.mkDerivation { # retroshare-gui/src/retroshare-gui.pro \ # retroshare-nogui/src/retroshare-nogui.pro - buildInputs = [ speex qt libupnp gpgme gnome3.libgnome_keyring glib libssh pkgconfig + buildInputs = [ speex qt4 libupnp gpgme gnome3.libgnome_keyring glib libssh pkgconfig qmake4Hook protobuf bzip2 libXScrnSaver curl libxml2 libxslt sqlcipher libmicrohttpd opencv ]; - configurePhase = '' - qmake PREFIX=$out DESTDIR=$out RetroShare.pro + preConfigure = '' + qmakeFlags="$qmakeFlags DESTDIR=$out" ''; enableParallelBuilding = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7ed4d8859c7..78c4e3d3fdc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13660,9 +13660,7 @@ in qt = qt4; }; - retroshare06 = lowPrio (callPackage ../applications/networking/p2p/retroshare/0.6.nix { - qt = qt4; - }); + retroshare06 = lowPrio (callPackage ../applications/networking/p2p/retroshare/0.6.nix { }); RhythmDelay = callPackage ../applications/audio/RhythmDelay { }; From 04e1b8eac42c90c213f7ffc880a29b3e78e73f5f Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 17 Apr 2016 02:39:30 +0300 Subject: [PATCH 054/103] retroshare: move to qmake4Hook --- .../applications/networking/p2p/retroshare/default.nix | 10 +++++----- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/networking/p2p/retroshare/default.nix b/pkgs/applications/networking/p2p/retroshare/default.nix index e7fe79d66a5..314d0557e9f 100644 --- a/pkgs/applications/networking/p2p/retroshare/default.nix +++ b/pkgs/applications/networking/p2p/retroshare/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, qt, libupnp, gpgme, gnome3, glib, libssh, pkgconfig, protobuf, bzip2 +{ stdenv, fetchurl, cmake, qt4, qmake4Hook, libupnp, gpgme, gnome3, glib, libssh, pkgconfig, protobuf, bzip2 , libXScrnSaver, speex, curl, libxml2, libxslt }: stdenv.mkDerivation { @@ -9,7 +9,7 @@ stdenv.mkDerivation { sha256 = "0l2n4pr1hq66q6qa073hrdx3s3d7iw54z8ay1zy82zhk2rwhsavp"; }; - NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/glib-2.0 -I${glib.dev}/lib/glib-2.0/include -I${libxml2.dev}/include/libxml2"; + NIX_CFLAGS_COMPILE = [ "-I${glib.dev}/include/glib-2.0" "-I${glib.dev}/lib/glib-2.0/include" "-I${libxml2.dev}/include/libxml2" ]; patchPhase = '' sed -i 's/UpnpString_get_String(es_event->PublisherUrl)/es_event->PublisherUrl/' \ @@ -22,13 +22,13 @@ stdenv.mkDerivation { libretroshare/src/rsserver/rsinit.cc ''; - buildInputs = [ speex qt libupnp gpgme gnome3.libgnome_keyring glib libssh pkgconfig + buildInputs = [ speex qt4 qmake4Hook libupnp gpgme gnome3.libgnome_keyring glib libssh pkgconfig protobuf bzip2 libXScrnSaver curl libxml2 libxslt ]; sourceRoot = "retroshare-0.5.5/src"; - configurePhase = '' - qmake PREFIX=$out DESTDIR=$out RetroShare.pro + preConfigure = '' + qmakeFlags="$qmakeFlags DESTDIR=$out" ''; postInstall = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 78c4e3d3fdc..510ccc46e8c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13656,9 +13656,7 @@ in remotebox = callPackage ../applications/virtualization/remotebox { }; - retroshare = callPackage ../applications/networking/p2p/retroshare { - qt = qt4; - }; + retroshare = callPackage ../applications/networking/p2p/retroshare { }; retroshare06 = lowPrio (callPackage ../applications/networking/p2p/retroshare/0.6.nix { }); From 83406bc171ca2b385c49838e6ed5e89007a875b5 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 17 Apr 2016 02:39:58 +0300 Subject: [PATCH 055/103] x2goclient: move to qmake4Hook --- .../applications/networking/remote/x2goclient/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/remote/x2goclient/default.nix b/pkgs/applications/networking/remote/x2goclient/default.nix index 02a25b9a270..09d4cf8dac5 100644 --- a/pkgs/applications/networking/remote/x2goclient/default.nix +++ b/pkgs/applications/networking/remote/x2goclient/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cups, libssh, libXpm, nxproxy, openldap, makeWrapper, qt4 }: +{ stdenv, fetchurl, cups, libssh, libXpm, nxproxy, openldap, makeWrapper, qt4, qmake4Hook }: stdenv.mkDerivation rec { name = "x2goclient-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ cups libssh libXpm nxproxy openldap qt4 ]; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper qmake4Hook ]; patchPhase = '' substituteInPlace Makefile \ @@ -19,7 +19,9 @@ stdenv.mkDerivation rec { --replace "-o root -g root" "" ''; - makeFlags = [ "PREFIX=$(out)" "ETCDIR=$(out)/etc" ]; + preConfigure = '' + qmakeFlags="$qmakeFlags ETCDIR=$out/etc" + ''; enableParallelBuilding = true; From 0b88755d3751271dc544833d61888b5809f0bba2 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 16 Apr 2016 22:59:18 +0300 Subject: [PATCH 056/103] fritzing: move to qmakeHook This reverts commit 81fc546df3e9549aaba1581ea8c5425ddd0f0e34. --- .../science/electronics/fritzing/default.nix | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/pkgs/applications/science/electronics/fritzing/default.nix b/pkgs/applications/science/electronics/fritzing/default.nix index ff0502ac0cb..110759ea292 100644 --- a/pkgs/applications/science/electronics/fritzing/default.nix +++ b/pkgs/applications/science/electronics/fritzing/default.nix @@ -1,7 +1,6 @@ -{ stdenv, fetchurl, qtbase, qtsvg, boost }: +{ stdenv, fetchurl, qtbase, qtsvg, qmakeHook, boost }: stdenv.mkDerivation rec { - version = "0.9.0b"; name = "fritzing-${version}"; @@ -10,19 +9,7 @@ stdenv.mkDerivation rec { sha256 = "181qnknq1j5x075icpw2qk0sc4wcj9f2hym533vs936is0wxp2gk"; }; - unpackPhase = '' - tar xjf ${src} - ''; - - buildInputs = [ qtbase qtsvg boost ]; - - configurePhase = '' - runHook preConfigure - cd fritzing-${version}.source - echo $PATH - qmake PREFIX=$out phoenix.pro - runHook postConfigure - ''; + buildInputs = [ qtbase qtsvg boost qmakeHook ]; meta = { description = "An open source prototyping tool for Arduino-based projects"; From fb2c651647a6de71d4ab036215b1cf1758addcc2 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 16 Apr 2016 22:59:18 +0300 Subject: [PATCH 057/103] qgroundcontrol: move to qmakeHook This reverts commit 11294eaf168b524da9601c8b35d71b72ba3ad040. --- .../science/robotics/qgroundcontrol/default.nix | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/science/robotics/qgroundcontrol/default.nix b/pkgs/applications/science/robotics/qgroundcontrol/default.nix index 692be0a88b1..cac9fef182c 100644 --- a/pkgs/applications/science/robotics/qgroundcontrol/default.nix +++ b/pkgs/applications/science/robotics/qgroundcontrol/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit, git, espeak, SDL, udev, doxygen, cmake, overrideCC#, gcc48 , qtbase, qtlocation, qtserialport, qtdeclarative, qtconnectivity, qtxmlpatterns - , qtsvg, qtquick1, qtquickcontrols, qtgraphicaleffects + , qtsvg, qtquick1, qtquickcontrols, qtgraphicaleffects, qmakeHook , makeQtWrapper, lndir , gst_all_1, qt_gstreamer1, pkgconfig, glibc , version ? "2.9.4" @@ -23,21 +23,11 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; nativeBuildInputs = [ - pkgconfig makeQtWrapper + pkgconfig makeQtWrapper qmakeHook ] ++ qtInputs; patches = [ ./0001-fix-gcc-cmath-namespace-issues.patch ]; - configurePhase = '' - runHook preConfigure - mkdir build - (cd build && qmake ../qgroundcontrol.pro) - runHook postConfigure - ''; - - preBuild = "pushd build/"; - postBuild = "popd"; - installPhase = '' mkdir -p $out/share/applications cp -v qgroundcontrol.desktop $out/share/applications From 661641aeb7e2b789c81ef206debd9bd902ec1fda Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 17 Apr 2016 02:41:47 +0300 Subject: [PATCH 058/103] git-and-tools: move to callPackage --- .../git-and-tools/default.nix | 41 ++++--------------- 1 file changed, 9 insertions(+), 32 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index fa8f43a45c6..e193701ff95 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -3,12 +3,7 @@ */ args @ {pkgs}: with args; with pkgs; let - inherit (pkgs) stdenv fetchgit fetchurl subversion; - - gitBase = lib.makeOverridable (import ./git) { - inherit fetchurl stdenv curl openssl zlib expat perl python gettext gnugrep - asciidoc xmlto docbook2x docbook_xsl docbook_xml_dtd_45 libxslt cpio tcl - tk makeWrapper subversionClient gzip openssh libiconv; + gitBase = callPackage ./git { texinfo = texinfo5; svnSupport = false; # for git-svn support guiSupport = false; # requires tcl/tk @@ -64,44 +59,28 @@ rec { git-stree = callPackage ./git-stree { }; - git2cl = import ./git2cl { - inherit fetchgit stdenv perl; - }; + git2cl = callPackage ./git2cl { }; - gitFastExport = import ./fast-export { - inherit fetchgit stdenv mercurial coreutils git makeWrapper subversion; - }; + gitFastExport = callPackage ./fast-export { }; gitRemoteGcrypt = callPackage ./git-remote-gcrypt { }; gitflow = callPackage ./gitflow { }; - hub = import ./hub { - inherit go; - inherit stdenv fetchgit; + hub = callPackage ./hub { inherit (darwin) Security; }; - qgit = import ./qgit { - inherit fetchurl stdenv; - inherit (xorg) libXext libX11; - qt = qt4; - }; + qgit = callPackage ./qgit { }; - qgitGit = import ./qgit/qgit-git.nix { - inherit fetchurl sourceFromHead stdenv; - inherit (xorg) libXext libX11; - qt = qt4; - }; + qgitGit = callPackage ./qgit/qgit-git.nix { }; - stgit = import ./stgit { - inherit fetchurl stdenv python git; + stgit = callPackage ./stgit { }; subgit = callPackage ./subgit { }; - svn2git = import ./svn2git { - inherit stdenv fetchurl ruby makeWrapper; + svn2git = callPackage ./svn2git { git = gitSVN; }; @@ -109,9 +88,7 @@ rec { tig = callPackage ./tig { }; - topGit = lib.makeOverridable (import ./topgit) { - inherit stdenv fetchurl; - }; + topGit = callPackage ./topgit { }; transcrypt = callPackage ./transcrypt { }; } From a4e868a1022eb67b81088c0d2085b26948bf0fb2 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 17 Apr 2016 02:42:02 +0300 Subject: [PATCH 059/103] qgit: move to qmake4Hook --- .../git-and-tools/qgit/default.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/qgit/default.nix b/pkgs/applications/version-management/git-and-tools/qgit/default.nix index a7e6a62ce5f..3f5f9a2dbe1 100644 --- a/pkgs/applications/version-management/git-and-tools/qgit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/qgit/default.nix @@ -1,21 +1,26 @@ -{stdenv, fetchurl, qt, libXext, libX11}: +{ stdenv, fetchurl, qt4, qmake4Hook, libXext, libX11 }: stdenv.mkDerivation rec { name = "qgit-2.5"; + meta = { license = stdenv.lib.licenses.gpl2; homepage = "http://libre.tibirna.org/projects/qgit/wiki/QGit"; description = "Graphical front-end to Git"; - inherit (qt.meta) platforms; + inherit (qt4.meta) platforms; }; + src = fetchurl { url = "http://libre.tibirna.org/attachments/download/9/${name}.tar.gz"; sha256 = "25f1ca2860d840d87b9919d34fc3a1b05d4163671ed87d29c3e4a8a09e0b2499"; }; - buildInputs = [qt libXext libX11]; - configurePhase = "qmake PREFIX=$out"; + + buildInputs = [ qt4 libXext libX11 ]; + + nativeBuildInputs = [ qmake4Hook ]; + installPhase = '' install -s -D -m 755 bin/qgit "$out/bin/qgit" ''; From 93253939599e149c321e9e49ff369b602fe414ae Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 17 Apr 2016 02:42:14 +0300 Subject: [PATCH 060/103] qgit-git: move to qmake4Hook --- .../git-and-tools/qgit/qgit-git.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/qgit/qgit-git.nix b/pkgs/applications/version-management/git-and-tools/qgit/qgit-git.nix index 590e090de48..c3d3c77ad33 100644 --- a/pkgs/applications/version-management/git-and-tools/qgit/qgit-git.nix +++ b/pkgs/applications/version-management/git-and-tools/qgit/qgit-git.nix @@ -1,20 +1,21 @@ -{stdenv, fetchurl, qt, libXext, libX11, sourceFromHead}: +{ stdenv, fetchurl, qt4, qmake4Hook, libXext, libX11, sourceFromHead }: stdenv.mkDerivation rec { name = "qgit-git"; + meta = { license = stdenv.lib.licenses.gpl2; homepage = "http://digilander.libero.it/mcostalba/"; description = "Graphical front-end to Git"; }; + # REGION AUTO UPDATE: { name="qgit"; type="git"; url="git://git.kernel.org/pub/scm/qgit/qgit4.git"; } src = sourceFromHead "qgit-a0252ed2a6a72b50e65d027adce8afa22e874277.tar.gz" (fetchurl { url = "http://mawercer.de/~nix/repos/qgit-a0252ed2a6a72b50e65d027adce8afa22e874277.tar.gz"; sha256 = "17e4727ac68b4f2e8503289d5b6a2c042547e7be133e7f8195b79e33eab61b93"; }); # END - buildInputs = [qt libXext libX11]; - buildPhase = '' - qmake PREFIX=$out - make - ''; + + buildInputs = [ qt4 libXext libX11 ]; + + nativeBuildInputs = [ qmake4Hook ]; } From e5e09e8cc7a98422f62b4c617efcaaa0e82ed71d Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 17 Apr 2016 02:42:27 +0300 Subject: [PATCH 061/103] svn2git-kde: move to qmake4Hook --- .../git-and-tools/svn2git-kde/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/svn2git-kde/default.nix b/pkgs/applications/version-management/git-and-tools/svn2git-kde/default.nix index f282fa6635b..e8f9078a839 100644 --- a/pkgs/applications/version-management/git-and-tools/svn2git-kde/default.nix +++ b/pkgs/applications/version-management/git-and-tools/svn2git-kde/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, qt4, subversion, apr}: +{ stdenv, fetchgit, qt4, qmake4Hook, subversion, apr }: stdenv.mkDerivation rec { name = "svn2git-kde-1.0.5"; @@ -9,10 +9,10 @@ stdenv.mkDerivation rec { sha256 = "818673fe751b00a42b6ed3e78a783549fb09b5245a01dee47b3dded667bfc582"; }; - buildPhase = '' + NIX_CFLAGS_COMPILE = [ "-I${apr}/include/apr-1" "-I${subversion.dev}/include/subversion-1" "-DVER=\"${src.rev}\"" ]; + + patchPhase = '' sed -i 's|/bin/cat|cat|' ./src/repository.cpp - qmake - make CXXFLAGS='-I${apr}/include/apr-1 -I${subversion.dev}/include/subversion-1 -DVER="\"${src.rev}\""' ''; installPhase = '' @@ -22,5 +22,7 @@ stdenv.mkDerivation rec { buildInputs = [ subversion apr qt4 ]; + nativeBuildInputs = [ qmake4Hook ]; + meta.broken = true; } From 9a8a4b6efeb6cd90f4504b06b8d05a2f5b77316f Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 17 Apr 2016 02:42:39 +0300 Subject: [PATCH 062/103] guitone: move to qmake4Hook --- pkgs/applications/version-management/guitone/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/version-management/guitone/default.nix b/pkgs/applications/version-management/guitone/default.nix index 135e7c7e1ef..8731cbfde19 100644 --- a/pkgs/applications/version-management/guitone/default.nix +++ b/pkgs/applications/version-management/guitone/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchmtn, qt4, pkgconfig, graphviz }: +{ stdenv, fetchurl, fetchmtn, qt4, qmake4Hook, pkgconfig, graphviz }: let version = "1.0-mtn-head"; in stdenv.mkDerivation rec { @@ -16,10 +16,7 @@ stdenv.mkDerivation rec { branch = "net.venge.monotone.guitone"; }; - buildInputs = [ qt4 pkgconfig graphviz ]; - - prefixKey="PREFIX="; - configureScript = "qmake guitone.pro"; + buildInputs = [ qt4 qmake4Hook pkgconfig graphviz ]; meta = { description = "Qt4 based GUI for monotone"; From 2816ad29e512cec244e28f95e909177fbe9d8f69 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 17 Apr 2016 02:42:48 +0300 Subject: [PATCH 063/103] bomi: move to qmakeHook --- pkgs/applications/video/bomi/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/bomi/default.nix b/pkgs/applications/video/bomi/default.nix index f9301781fc1..c017ed4cda3 100644 --- a/pkgs/applications/video/bomi/default.nix +++ b/pkgs/applications/video/bomi/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fetchFromGitHub, pkgconfig, perl, python, which, makeQtWrapper , libX11, libxcb, mesa -, qtbase, qtdeclarative, qtquickcontrols, qttools, qtx11extras +, qtbase, qtdeclarative, qtquickcontrols, qttools, qtx11extras, qmakeHook , ffmpeg , libchardet , mpg123 @@ -76,6 +76,8 @@ stdenv.mkDerivation rec { ${optionalString youtubeSupport "--prefix PATH ':' '${youtube-dl}/bin'"} ''; + dontUseQmakeConfigure = true; + configureFlags = with stdenv.lib; [ "--qmake=qmake" ] ++ optional jackSupport "--enable-jack" @@ -84,7 +86,7 @@ stdenv.mkDerivation rec { ++ optional cddaSupport "--enable-cdda" ; - nativeBuildInputs = [ pkgconfig perl python which qttools makeQtWrapper ]; + nativeBuildInputs = [ pkgconfig perl python which qttools makeQtWrapper qmakeHook ]; enableParallelBuilding = true; From 3656842478914d5caacc96c79a6fece854b2ccc1 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 17 Apr 2016 02:42:56 +0300 Subject: [PATCH 064/103] clipgrab: move to qmake4Hook --- pkgs/applications/video/clipgrab/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/video/clipgrab/default.nix b/pkgs/applications/video/clipgrab/default.nix index e634a0caa3f..b8967323c98 100644 --- a/pkgs/applications/video/clipgrab/default.nix +++ b/pkgs/applications/video/clipgrab/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeDesktopItem, ffmpeg, qt4 }: +{ stdenv, fetchurl, makeDesktopItem, ffmpeg, qt4, qmake4Hook }: stdenv.mkDerivation rec { name = "clipgrab-${version}"; @@ -11,6 +11,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ ffmpeg qt4 ]; + nativeBuildInputs = [ qmake4Hook ]; postPatch = stdenv.lib.optionalString (ffmpeg != null) '' substituteInPlace converter_ffmpeg.cpp \ @@ -18,9 +19,7 @@ stdenv.mkDerivation rec { --replace '"ffmpeg ' '"${ffmpeg.bin}/bin/ffmpeg ' ''; - configurePhase = '' - qmake clipgrab.pro - ''; + qmakeFlags = [ "clipgrab.pro" ]; enableParallelBuilding = true; From 09394ae019bf1782051e959dc473e1d442a93f1f Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 17 Apr 2016 02:43:08 +0300 Subject: [PATCH 065/103] linuxstopmotion: move to qmake4Hook --- pkgs/applications/video/linuxstopmotion/default.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/video/linuxstopmotion/default.nix b/pkgs/applications/video/linuxstopmotion/default.nix index 23a033844b3..293bdd835b5 100644 --- a/pkgs/applications/video/linuxstopmotion/default.nix +++ b/pkgs/applications/video/linuxstopmotion/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchgit, pkgconfig, qt4, SDL, SDL_image, libvorbis, libtar, libxml2 -, gamin +, gamin, qmake4Hook }: stdenv.mkDerivation rec { @@ -12,14 +12,10 @@ stdenv.mkDerivation rec { sha256 = "1xkkrhllgy2d7k0vrdj794ya7y3g3n7xh8c2qgnb26yrarz79dqj"; }; - buildInputs = [ pkgconfig qt4 SDL SDL_image libvorbis libtar libxml2 gamin ]; + buildInputs = [ pkgconfig qt4 SDL SDL_image libvorbis libtar libxml2 gamin qmake4Hook ]; patches = [ ./linuxstopmotion-fix-wrong-isProcess-logic.patch ]; - configurePhase = '' - qmake PREFIX="$out" - ''; - # Installation breaks without this preInstall = '' mkdir -p "$out/share/stopmotion/translations/" From 35ab3d55220d5248d0903f5af6025487c91b6f44 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 17 Apr 2016 02:43:15 +0300 Subject: [PATCH 066/103] minitube: move to qmake4Hook --- pkgs/applications/video/minitube/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/video/minitube/default.nix b/pkgs/applications/video/minitube/default.nix index f9d887189ec..1a621032125 100644 --- a/pkgs/applications/video/minitube/default.nix +++ b/pkgs/applications/video/minitube/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, makeWrapper, phonon, phonon_backend_vlc, qt4 +{ stdenv, fetchFromGitHub, makeWrapper, phonon, phonon_backend_vlc, qt4, qmake4Hook # "Free" API key generated by nckx , withAPIKey ? "AIzaSyBtFgbln3bu1swQC-naMxMtKh384D3xJZE" }: @@ -14,11 +14,9 @@ stdenv.mkDerivation rec { }; buildInputs = [ phonon phonon_backend_vlc qt4 ]; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper qmake4Hook ]; - configurePhase = '' - qmake PREFIX=$out "DEFINES += APP_GOOGLE_API_KEY=${withAPIKey}" - ''; + qmakeFlags = [ "DEFINES+=APP_GOOGLE_API_KEY=${withAPIKey}" ]; enableParallelBuilding = true; From 7e4e4799f49d81a3dafa1d0cbbf5c94b7aef9874 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 17 Apr 2016 02:43:25 +0300 Subject: [PATCH 067/103] qgifer: move to qmake4Hook --- pkgs/applications/video/qgifer/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/video/qgifer/default.nix b/pkgs/applications/video/qgifer/default.nix index f528ce99a8a..8185e15dcc8 100644 --- a/pkgs/applications/video/qgifer/default.nix +++ b/pkgs/applications/video/qgifer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchsvn, cmake, opencv, qt, giflib }: +{ stdenv, fetchsvn, cmake, opencv, qt4, giflib }: stdenv.mkDerivation rec { name = "qgifer-${version}"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { substituteInPlace CMakeLists.txt --replace "SET(CMAKE_INSTALL_PREFIX" "#" ''; - buildInputs = [ cmake opencv qt giflib ]; + buildInputs = [ cmake opencv qt4 giflib ]; meta = with stdenv.lib; { description = "Video-based animated GIF creator"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 510ccc46e8c..eb2d35866af 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2976,7 +2976,6 @@ in qgifer = callPackage ../applications/video/qgifer { giflib = giflib_4_1; - qt = qt4; }; qhull = callPackage ../development/libraries/qhull { }; From 577ea10f6865f592429c40cdf0cfd9c3a9287eb3 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 16 Apr 2016 22:59:18 +0300 Subject: [PATCH 068/103] shotcut: move to qmakeHook This reverts commit dbc1605deaeafc07c79cddf4d5e756074d8825b3. --- pkgs/applications/video/shotcut/default.nix | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/video/shotcut/default.nix b/pkgs/applications/video/shotcut/default.nix index d2400475a0b..fdadc1d99ab 100644 --- a/pkgs/applications/video/shotcut/default.nix +++ b/pkgs/applications/video/shotcut/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, SDL, frei0r, gettext, makeWrapper, mlt, pkgconfig, qtbase }: +{ stdenv, fetchurl, SDL, frei0r, gettext, makeWrapper, mlt, pkgconfig, qtbase, qmakeHook }: stdenv.mkDerivation rec { name = "shotcut-${version}"; @@ -9,13 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1504ds3ppqmpg84nb2gb74qndqysjwn3xw7n8xv19kd1pppnr10f"; }; - buildInputs = [ SDL frei0r gettext makeWrapper mlt pkgconfig qtbase ]; - - configurePhase = '' - runHook preConfigure - qmake PREFIX=$out - runHook postConfigure - ''; + buildInputs = [ SDL frei0r gettext makeWrapper mlt pkgconfig qtbase qmakeHook ]; postInstall = '' mkdir -p $out/share/shotcut From 6554997eaa1756456f2bfa4952f371e5288e74c3 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 16 Apr 2016 22:59:18 +0300 Subject: [PATCH 069/103] zeal: move to qmakeHook This reverts commit 9cfc8d94bb22000d1b648066c3d8b580f27d1271. --- pkgs/data/documentation/zeal/default.nix | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/pkgs/data/documentation/zeal/default.nix b/pkgs/data/documentation/zeal/default.nix index dd681404e85..89e5d83df61 100644 --- a/pkgs/data/documentation/zeal/default.nix +++ b/pkgs/data/documentation/zeal/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, libarchive, pkgconfig, qtbase -, qtimageformats, qtwebkit, qtx11extras, xorg }: +, qtimageformats, qtwebkit, qtx11extras, xcbutilkeysyms, qmakeHook }: stdenv.mkDerivation rec { version = "0.2.1"; @@ -13,18 +13,12 @@ stdenv.mkDerivation rec { }; buildInputs = [ - xorg.xcbutilkeysyms pkgconfig qtbase qtimageformats qtwebkit qtx11extras libarchive + xcbutilkeysyms pkgconfig qtbase qtimageformats qtwebkit qtx11extras libarchive qmakeHook ]; - configurePhase = '' - runHook preConfigure - qmake PREFIX=/ - runHook postConfigure - ''; + qmakeFlags = [ "PREFIX=/" ]; - installPhase = '' - make INSTALL_ROOT=$out install - ''; + installFlags = [ "INSTALL_ROOT=$(out)" ]; enableParallelBuilding = true; From ba5275115784e9484d0b10f06e422cc9755c06c2 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 17 Apr 2016 02:44:28 +0300 Subject: [PATCH 070/103] eql: flags is a list of strings --- pkgs/development/compilers/eql/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/eql/default.nix b/pkgs/development/compilers/eql/default.nix index def60aa295f..de531e901d9 100644 --- a/pkgs/development/compilers/eql/default.nix +++ b/pkgs/development/compilers/eql/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ ecl qt4 xorgserver xkbcomp xkeyboard_config ]; - NIX_CFLAGS_COMPILE = "-fPIC"; + NIX_CFLAGS_COMPILE = [ "-fPIC" ]; postPatch = '' sed -re 's@[(]in-home "gui/.command-history"[)]@(concatenate '"'"'string (ext:getenv "HOME") "/.eql-gui-command-history")@' -i gui/gui.lisp From 31d6dd6be0b4d5a376f7ef2cc2039265f71b79dd Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 17 Apr 2016 02:44:48 +0300 Subject: [PATCH 071/103] CGAL: fix build --- pkgs/development/libraries/CGAL/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/CGAL/default.nix b/pkgs/development/libraries/CGAL/default.nix index 1f964388cbd..b8fd4af812a 100644 --- a/pkgs/development/libraries/CGAL/default.nix +++ b/pkgs/development/libraries/CGAL/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, boost, gmp, mpfr }: +{ stdenv, fetchurl, cmake, boost, gmp, mpfr, mesa_glu }: stdenv.mkDerivation rec { version = "4.7"; @@ -12,6 +12,7 @@ stdenv.mkDerivation rec { # note: optional component libCGAL_ImageIO would need zlib and opengl; # there are also libCGAL_Qt{3,4} omitted ATM buildInputs = [ cmake boost gmp mpfr ]; + #propagatedBuildInputs = [ mesa_glu ]; doCheck = false; From 068c7b68a2b9b349f467d3ea18cf8a6726085a94 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 16 Apr 2016 22:59:17 +0300 Subject: [PATCH 072/103] accounts-qt: move to qmakeHook This reverts commit 25382a37e38d92113ae671f0f2d6f1be9045015e. --- pkgs/development/libraries/accounts-qt/default.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/accounts-qt/default.nix b/pkgs/development/libraries/accounts-qt/default.nix index e82d37f1d3c..a16a0ef8cf5 100644 --- a/pkgs/development/libraries/accounts-qt/default.nix +++ b/pkgs/development/libraries/accounts-qt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab, doxygen, glib, libaccounts-glib, pkgconfig, qtbase }: +{ stdenv, fetchFromGitLab, doxygen, glib, libaccounts-glib, pkgconfig, qtbase, qmakeHook }: stdenv.mkDerivation rec { name = "accounts-qt-${version}"; @@ -12,12 +12,10 @@ stdenv.mkDerivation rec { }; buildInputs = [ glib libaccounts-glib qtbase ]; - nativeBuildInputs = [ doxygen pkgconfig ]; + nativeBuildInputs = [ doxygen pkgconfig qmakeHook ]; - configurePhase = '' - runHook preConfigure - qmake PREFIX=$out LIBDIR=$out/lib CMAKE_CONFIG_PATH=$out/lib/cmake - runHook postConfigure + preConfigure = '' + qmakeFlags="$qmakeFlags LIBDIR=$out/lib CMAKE_CONFIG_PATH=$out/lib/cmake" ''; meta = with stdenv.lib; { From 4b5bf1916ad705453b4fbb737d0a1a1dac2aacd4 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 17 Apr 2016 02:45:09 +0300 Subject: [PATCH 073/103] herqq: move to qmake4Hook --- pkgs/development/libraries/herqq/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/herqq/default.nix b/pkgs/development/libraries/herqq/default.nix index fee12592c63..39d5b2c792a 100644 --- a/pkgs/development/libraries/herqq/default.nix +++ b/pkgs/development/libraries/herqq/default.nix @@ -1,11 +1,9 @@ -{ stdenv, fetchurl, qt4, unzip }: +{ stdenv, fetchurl, qt4, qmake4Hook, unzip }: stdenv.mkDerivation rec { name = "herqq-1.0.0"; - buildInputs = [ qt4 unzip ]; - - configurePhase = "qmake PREFIX=$out herqq.pro"; + buildInputs = [ qt4 unzip qmake4Hook ]; src = fetchurl { url = "mirror://sourceforge/hupnp/${name}.zip"; From ac1a531933a25cce11465bc8cd24f2a6c12a4915 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 16 Apr 2016 22:59:20 +0300 Subject: [PATCH 074/103] libcommuni: move to qmakeHook This reverts commit ee1af147f35818f60d3cd6192a4828abdbfdc632. --- pkgs/development/libraries/libcommuni/default.nix | 12 ++++++------ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/libcommuni/default.nix b/pkgs/development/libraries/libcommuni/default.nix index 008311c620c..7b83be7e911 100644 --- a/pkgs/development/libraries/libcommuni/default.nix +++ b/pkgs/development/libraries/libcommuni/default.nix @@ -1,4 +1,4 @@ -{ fetchgit, qt5, stdenv +{ fetchgit, qtbase, qmakeHook, stdenv }: stdenv.mkDerivation rec { @@ -11,16 +11,16 @@ stdenv.mkDerivation rec { sha256 = "15sb7vinaaz1v5nclxpnp5p9a0kmfmlgiqibkipnyydizclidpfx"; }; - buildInputs = [ qt5.qtbase ]; + buildInputs = [ qtbase ]; + nativeBuildInputs = [ qmakeHook ]; enableParallelBuild = true; - postPatch = '' - sed -i -e 's|/bin/pwd|pwd|g' -e 's/which/type -P/' configure + configurePhase = '' + sed -i -e 's|/bin/pwd|pwd|g' configure + ./configure -config release -prefix $out -qmake $QMAKE ''; - configureFlags = [ "-config release" ]; - meta = with stdenv.lib; { description = "A cross-platform IRC framework written with Qt"; homepage = https://communi.github.io; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index eb2d35866af..007c8df4f07 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7385,7 +7385,7 @@ in libcm = callPackage ../development/libraries/libcm { }; - libcommuni = callPackage ../development/libraries/libcommuni { }; + libcommuni = qt5.callPackage ../development/libraries/libcommuni { }; libconfuse = callPackage ../development/libraries/libconfuse { }; From 9a2bd51a308ea98d7fcc12c8a53f404bfc271d4f Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 16 Apr 2016 22:59:17 +0300 Subject: [PATCH 075/103] libkeyfinder: move to qmakeHook This reverts commit f43d8b233621c0a5ac575c6236b0e2c5b58611f4. --- pkgs/development/libraries/libkeyfinder/default.nix | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/libkeyfinder/default.nix b/pkgs/development/libraries/libkeyfinder/default.nix index 729df918e57..d95ada04a34 100644 --- a/pkgs/development/libraries/libkeyfinder/default.nix +++ b/pkgs/development/libraries/libkeyfinder/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fftw, qtbase }: +{ stdenv, fetchFromGitHub, fftw, qtbase, qmakeHook }: stdenv.mkDerivation rec { name = "libkeyfinder-${version}"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { owner = "ibsh"; }; - buildInputs = [ fftw qtbase ]; + buildInputs = [ fftw qtbase qmakeHook ]; postPatch = '' substituteInPlace LibKeyFinder.pro \ @@ -19,12 +19,6 @@ stdenv.mkDerivation rec { --replace "-stdlib=libc++" "" ''; - configurePhase = '' - runHook preConfigure - qmake - runHook postConfigure - ''; - enableParallelBuilding = true; postInstall = '' From 49558b04d256c1010c76b3491e84f3c1e1db7a98 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 17 Apr 2016 02:45:56 +0300 Subject: [PATCH 076/103] liqglviewer: move to qmake4Hook --- pkgs/development/libraries/libqglviewer/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/libqglviewer/default.nix b/pkgs/development/libraries/libqglviewer/default.nix index 6b40eeb3b1f..eef9e05ca03 100644 --- a/pkgs/development/libraries/libqglviewer/default.nix +++ b/pkgs/development/libraries/libqglviewer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, qt4 }: +{ stdenv, fetchurl, qt4, qmake4Hook }: stdenv.mkDerivation rec { name = "libqglviewer-2.6.3"; @@ -9,13 +9,11 @@ stdenv.mkDerivation rec { sha256 = "00jdkyk4wg1356c3ar6nk3hyp494ya3yvshq9m57kfmqpn3inqdy"; }; - buildInputs = [ qt4 ]; + buildInputs = [ qt4 qmake4Hook ]; - buildPhase = + postPatch = '' cd QGLViewer - qmake PREFIX=$out - make ''; meta = with stdenv.lib; { From 005dab1a7afee27358e011906231ad7eed7c4120 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 16 Apr 2016 23:02:33 +0300 Subject: [PATCH 077/103] qmltermwidget: move to qmakeHook This reverts commit 2d6ea2cc3072f9bd86d655bf7e614d556ee0b339. --- pkgs/development/libraries/qmltermwidget/default.nix | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/qmltermwidget/default.nix b/pkgs/development/libraries/qmltermwidget/default.nix index 359a4341537..1620649a3cc 100644 --- a/pkgs/development/libraries/qmltermwidget/default.nix +++ b/pkgs/development/libraries/qmltermwidget/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, qtbase, qtquick1 }: +{ stdenv, fetchgit, qtbase, qtquick1, qmakeHook }: stdenv.mkDerivation rec { version = "0.1.0"; @@ -11,19 +11,14 @@ stdenv.mkDerivation rec { }; buildInputs = [ qtbase qtquick1 ]; + nativeBuildInputs = [ qmakeHook ]; patchPhase = '' substituteInPlace qmltermwidget.pro \ --replace '$$[QT_INSTALL_QML]' "/lib/qt5/qml/" ''; - configurePhase = '' - runHook preConfigure - qmake PREFIX=$out - runHook postConfigure - ''; - - installPhase=''make INSTALL_ROOT="$out" install''; + installFlags = [ "INSTALL_ROOT=$(out)" ]; enableParallelBuilding = true; From e307c3dac2a70e4861ffb54f08ce00c308f27f54 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 17 Apr 2016 02:46:24 +0300 Subject: [PATCH 078/103] qoauth: move to qmake4Hook --- pkgs/development/libraries/qoauth/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/qoauth/default.nix b/pkgs/development/libraries/qoauth/default.nix index f93e4479e71..5a448d33067 100644 --- a/pkgs/development/libraries/qoauth/default.nix +++ b/pkgs/development/libraries/qoauth/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, qt4, qca2 }: +{ stdenv, fetchurl, qt4, qca2, qmake4Hook }: stdenv.mkDerivation { name = "qoauth-1.0.1"; @@ -9,13 +9,13 @@ stdenv.mkDerivation { sha256 = "1ax0g4dd49a3a1699ams13bkhz690xfwqg8rxp1capbdpf2aa8cp"; }; - configurePhase = "qmake PREFIX=$prefix"; patchPhase = "sed -e 's/lib64/lib/g' -i src/src.pro"; buildInputs = [ qt4 qca2 ]; + nativeBuildInputs = [ qmake4Hook ]; - NIX_CFLAGS_COMPILE="-I${qca2}/include/QtCrypto"; - NIX_LDFLAGS = "-lqca"; + NIX_CFLAGS_COMPILE = [ "-I${qca2}/include/QtCrypto" ]; + NIX_LDFLAGS = [ "-lqca" ]; meta = { description = "Qt library for OAuth authentication"; From b69940ee7686897e743d3083a226314d491b57cc Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 17 Apr 2016 02:46:33 +0300 Subject: [PATCH 079/103] qscintilla: move to qmake4Hook --- pkgs/development/libraries/qscintilla/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/qscintilla/default.nix b/pkgs/development/libraries/qscintilla/default.nix index 26d412e5a8c..bc44f53fa6e 100644 --- a/pkgs/development/libraries/qscintilla/default.nix +++ b/pkgs/development/libraries/qscintilla/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, qt }: +{ stdenv, fetchurl, qt4, qmake4Hook }: stdenv.mkDerivation rec { pname = "qscintilla"; @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "d7c32e32582f93779de861006d87467b38b9ebc06e3d0b32e981cb24369fa417"; }; - buildInputs = [ qt ]; + buildInputs = [ qt4 ]; + nativeBuildInputs = [ qmake4Hook ]; preConfigure = '' cd Qt4Qt5 @@ -20,7 +21,6 @@ stdenv.mkDerivation rec { -e "s,\$\$\\[QT_INSTALL_TRANSLATIONS\\],$out/share/qt/translations," \ -e "s,\$\$\\[QT_INSTALL_DATA\\],$out/share/qt," \ qscintilla.pro - qmake qscintilla.pro ''; meta = { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 007c8df4f07..ded7ed829d6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2986,9 +2986,7 @@ in qprint = callPackage ../tools/text/qprint { }; - qscintilla = callPackage ../development/libraries/qscintilla { - qt = qt4; - }; + qscintilla = callPackage ../development/libraries/qscintilla { }; qshowdiff = callPackage ../tools/text/qshowdiff { }; From 4a4567b73191840de2f54f7b8f7a257806c12043 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 17 Apr 2016 02:47:43 +0300 Subject: [PATCH 080/103] qt54.qtmultimedia: use qmakeFlags --- pkgs/development/libraries/qt-5/5.4/qtmultimedia.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/qt-5/5.4/qtmultimedia.nix b/pkgs/development/libraries/qt-5/5.4/qtmultimedia.nix index 8db8fa5f4b9..9eb68ba6b5b 100644 --- a/pkgs/development/libraries/qt-5/5.4/qtmultimedia.nix +++ b/pkgs/development/libraries/qt-5/5.4/qtmultimedia.nix @@ -8,7 +8,7 @@ qtSubmodule { buildInputs = [ pkgconfig alsaLib gstreamer gst-plugins-base libpulseaudio ]; - configureFlags = "GST_VERSION=1.0"; + qmakeFlags = [ "GST_VERSION=1.0" ]; postFixup = '' fixQtModuleCMakeConfig "Multimedia" fixQtModuleCMakeConfig "MultimediaWidgets" From 5b17e825594cdf8a0278795a7542fb22914b4673 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 17 Apr 2016 02:48:35 +0300 Subject: [PATCH 081/103] qt55.qtmultimedia: use qmakeFlags --- pkgs/development/libraries/qt-5/5.5/qtmultimedia.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/qt-5/5.5/qtmultimedia.nix b/pkgs/development/libraries/qt-5/5.5/qtmultimedia.nix index 8db8fa5f4b9..9eb68ba6b5b 100644 --- a/pkgs/development/libraries/qt-5/5.5/qtmultimedia.nix +++ b/pkgs/development/libraries/qt-5/5.5/qtmultimedia.nix @@ -8,7 +8,7 @@ qtSubmodule { buildInputs = [ pkgconfig alsaLib gstreamer gst-plugins-base libpulseaudio ]; - configureFlags = "GST_VERSION=1.0"; + qmakeFlags = [ "GST_VERSION=1.0" ]; postFixup = '' fixQtModuleCMakeConfig "Multimedia" fixQtModuleCMakeConfig "MultimediaWidgets" From 1875538730d44eda2d078498a5f53ee61fbb1daa Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 17 Apr 2016 02:49:29 +0300 Subject: [PATCH 082/103] qtscriptgenerator: spaces --- pkgs/development/libraries/qtscriptgenerator/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/qtscriptgenerator/default.nix b/pkgs/development/libraries/qtscriptgenerator/default.nix index b8ed81de487..5b93fbfaade 100644 --- a/pkgs/development/libraries/qtscriptgenerator/default.nix +++ b/pkgs/development/libraries/qtscriptgenerator/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, qt4}: +{ stdenv, fetchurl, qt4 }: stdenv.mkDerivation { name = "qtscriptgenerator-0.1.0"; From 82af8640e36c4b37ff3034f3a410334aa6f19caf Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 16 Apr 2016 23:01:40 +0300 Subject: [PATCH 083/103] quazip: move to qmakeHook This reverts commit d663b3df24b709fd972525ab73855843ff35d09d. --- pkgs/development/libraries/quazip/default.nix | 11 +++-------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/quazip/default.nix b/pkgs/development/libraries/quazip/default.nix index 7ef1a9212a1..a1eb2ad7084 100644 --- a/pkgs/development/libraries/quazip/default.nix +++ b/pkgs/development/libraries/quazip/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, zip, zlib, qt }: +{ fetchurl, stdenv, zip, zlib, qt, qmakeHook }: stdenv.mkDerivation rec { name = "quazip-0.7.1"; @@ -8,15 +8,10 @@ stdenv.mkDerivation rec { sha256 = "1pijy6zn8kdx9m6wrckid24vkgp250hklbpmgrpixiam6l889jbq"; }; - configurePhase = '' - runHook preConfigure - cd quazip && qmake quazip.pro - runHook postConfigure - ''; - - installFlags = "INSTALL_ROOT=$(out)"; + preConfigure = "cd quazip"; buildInputs = [ zlib qt ]; + nativeBuildInputs = [ qmakeHook ]; meta = { description = "Provides access to ZIP archives from Qt programs"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ded7ed829d6..e02186c5212 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3143,7 +3143,7 @@ in screen-message = callPackage ../tools/X11/screen-message { }; screencloud = callPackage ../applications/graphics/screencloud { - quazip = qt5.quazip.override { qt = qt4; }; + quazip = qt5.quazip.override { qt = qt4; qmakeHook = qmake4Hook; }; }; scrot = callPackage ../tools/graphics/scrot { }; From d441238b52693c8318840a2e3a8a5d9731fe0c1a Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 16 Apr 2016 23:01:26 +0300 Subject: [PATCH 084/103] qt5.qwt: move to qmakeHook This reverts commit 8779e0f2741bb3ae2aaf3b85baa35c9d31a4754b. --- pkgs/development/libraries/qwt/6.nix | 9 +++------ pkgs/development/libraries/qwt/default.nix | 6 +----- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/pkgs/development/libraries/qwt/6.nix b/pkgs/development/libraries/qwt/6.nix index a99573ca5e4..cd940b818e9 100644 --- a/pkgs/development/libraries/qwt/6.nix +++ b/pkgs/development/libraries/qwt/6.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, qtbase, qtsvg, qttools }: +{ stdenv, fetchurl, qtbase, qtsvg, qttools, qmakeHook }: stdenv.mkDerivation rec { name = "qwt-6.1.2"; @@ -9,16 +9,13 @@ stdenv.mkDerivation rec { }; propagatedBuildInputs = [ qtbase qtsvg qttools ]; + nativeBuildInputs = [ qmakeHook ]; postPatch = '' sed -e "s|QWT_INSTALL_PREFIX.*=.*|QWT_INSTALL_PREFIX = $out|g" -i qwtconfig.pri ''; - configurePhase = '' - runHook preConfigure - qmake -after doc.path=$out/share/doc/${name} -r - runHook postConfigure - ''; + qmakeFlags = [ "-after doc.path=$out/share/doc/${name}" ]; meta = with stdenv.lib; { description = "Qt widgets for technical applications"; diff --git a/pkgs/development/libraries/qwt/default.nix b/pkgs/development/libraries/qwt/default.nix index 451784261f8..4aa7c0bc7d5 100644 --- a/pkgs/development/libraries/qwt/default.nix +++ b/pkgs/development/libraries/qwt/default.nix @@ -15,11 +15,7 @@ stdenv.mkDerivation rec { sed -e "s|INSTALLBASE.*=.*|INSTALLBASE = $out|g" -i qwtconfig.pri ''; - configurePhase = '' - runHook preConfigure - qmake INSTALLBASE=$out -after doc.path=$out/share/doc/${name} -r - runHook postConfigure - ''; + configurePhase = ''qmake INSTALLBASE=$out -after doc.path=$out/share/doc/${name} -r''; meta = with stdenv.lib; { description = "Qt widgets for technical applications"; From 1b032e5221da9cc56ea2a89950d068173ba7b517 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 17 Apr 2016 02:50:08 +0300 Subject: [PATCH 085/103] qwt: move to qmake4Hook --- pkgs/development/libraries/qwt/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/qwt/default.nix b/pkgs/development/libraries/qwt/default.nix index 4aa7c0bc7d5..da5769e92cd 100644 --- a/pkgs/development/libraries/qwt/default.nix +++ b/pkgs/development/libraries/qwt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, qt4 }: +{ stdenv, fetchurl, qt4, qmake4Hook }: stdenv.mkDerivation rec { name = "qwt-5.2.3"; @@ -9,13 +9,16 @@ stdenv.mkDerivation rec { }; propagatedBuildInputs = [ qt4 ]; + nativeBuildInputs = [ qmake4Hook ]; postPatch = '' sed -e "s@\$\$\[QT_INSTALL_PLUGINS\]@$out/lib/qt4/plugins@" -i designer/designer.pro sed -e "s|INSTALLBASE.*=.*|INSTALLBASE = $out|g" -i qwtconfig.pri ''; - configurePhase = ''qmake INSTALLBASE=$out -after doc.path=$out/share/doc/${name} -r''; + preConfigure = '' + qmakeFlags="$qmakeFlags INSTALLBASE=$out -after doc.path=$out/share/doc/${name}" + ''; meta = with stdenv.lib; { description = "Qt widgets for technical applications"; From 79008f6095acaa0b5d5e6c8af708d691e2c7adf8 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 16 Apr 2016 22:59:17 +0300 Subject: [PATCH 086/103] signon: move to qmakeHook This reverts commit 96bed5b7aa92157586857255901d29de9ab05723. --- pkgs/development/libraries/signon/default.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/signon/default.nix b/pkgs/development/libraries/signon/default.nix index 2da555635b2..f2f7de5b712 100644 --- a/pkgs/development/libraries/signon/default.nix +++ b/pkgs/development/libraries/signon/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, doxygen, qtbase }: +{ stdenv, fetchurl, doxygen, qtbase, qmakeHook }: stdenv.mkDerivation rec { name = "signon-${version}"; @@ -9,12 +9,10 @@ stdenv.mkDerivation rec { }; buildInputs = [ qtbase ]; - nativeBuildInputs = [ doxygen ]; + nativeBuildInputs = [ doxygen qmakeHook ]; - configurePhase = '' - runHook preConfigure - qmake PREFIX=$out LIBDIR=$out/lib CMAKE_CONFIG_PATH=$out/lib/cmake/SignOnQt5 - runHook postConfigure + preConfigure = '' + qmakeFlags="$qmakeFlags LIBDIR=$out/lib CMAKE_CONFIG_PATH=$out/lib/cmake/SignOnQt5" ''; } From c161258003eee0d60618dd4bc39f543185f4517a Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 16 Apr 2016 22:59:17 +0300 Subject: [PATCH 087/103] pyqt5: move to qmakeHook This reverts commit f1c2572479265d121d55d9e3270dc1ebfee4aa00. --- pkgs/development/python-modules/pyqt/5.x.nix | 6 ++---- pkgs/top-level/python-packages.nix | 3 +-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/pyqt/5.x.nix b/pkgs/development/python-modules/pyqt/5.x.nix index b11e87fe1d9..0e5f5604a98 100644 --- a/pkgs/development/python-modules/pyqt/5.x.nix +++ b/pkgs/development/python-modules/pyqt/5.x.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, python, pkgconfig, qtbase, qtsvg, qtwebkit, sip, pythonDBus -, lndir, makeWrapper }: +, lndir, makeWrapper, qmakeHook }: let version = "5.5.1"; @@ -21,13 +21,12 @@ in stdenv.mkDerivation { buildInputs = [ python pkgconfig makeWrapper lndir - qtbase qtsvg qtwebkit + qtbase qtsvg qtwebkit qmakeHook ]; propagatedBuildInputs = [ sip ]; configurePhase = '' - runHook preConfigure mkdir -p $out lndir ${pythonDBus} $out @@ -45,7 +44,6 @@ in stdenv.mkDerivation { --destdir=$out/lib/${python.libPrefix}/site-packages \ --sipdir=$out/share/sip \ --designer-plugindir=$out/plugins/designer - runHook postConfigure ''; postInstall = '' diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3d1e2026a82..0771e4d1728 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -166,10 +166,9 @@ in modules // { pythonPackages = self; }; - pyqt5 = callPackage ../development/python-modules/pyqt/5.x.nix { + pyqt5 = pkgs.qt55.callPackage ../development/python-modules/pyqt/5.x.nix { sip = self.sip_4_16; pythonDBus = self.dbus; - inherit (pkgs.qt55) qtbase qtsvg qtwebkit; }; pyside = callPackage ../development/python-modules/pyside { }; From a9662f8c4576e31b5f1294c6a7cb95f7b9944ca6 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 17 Apr 2016 02:50:41 +0300 Subject: [PATCH 088/103] qtcreator: move to qmakeHook --- pkgs/development/qtcreator/default.nix | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/pkgs/development/qtcreator/default.nix b/pkgs/development/qtcreator/default.nix index a5dde0a580b..18e06cb8126 100644 --- a/pkgs/development/qtcreator/default.nix +++ b/pkgs/development/qtcreator/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, makeWrapper -, qtbase, qtquickcontrols, qtscript, qtdeclarative +, qtbase, makeQtWrapper, qtquickcontrols, qtscript, qtdeclarative, qmakeHook , withDocumentation ? false }: @@ -21,18 +21,15 @@ stdenv.mkDerivation rec { buildInputs = [ makeWrapper qtbase qtscript qtquickcontrols qtdeclarative ]; + nativeBuildInputs = [ qmakeHook makeQtWrapper ]; + doCheck = false; enableParallelBuilding = true; - preConfigure = '' - qmake -spec linux-g++ qtcreator.pro - ''; + buildFlags = optional withDocumentation "docs"; - buildFlags = optionalString withDocumentation " docs"; - - installFlags = "INSTALL_ROOT=$(out)" - + optionalString withDocumentation " install_docs"; + installFlags = [ "INSTALL_ROOT=$(out)" ] ++ optional withDocumentation "install_docs"; postInstall = '' # Install desktop file @@ -47,13 +44,7 @@ stdenv.mkDerivation rec { Type=Application Categories=Qt;Development;IDE; __EOF__ - # Wrap the qtcreator binary - addToSearchPath QML2_IMPORT_PATH "${qtquickcontrols}/lib/qt5/qml" - addToSearchPath QML2_IMPORT_PATH "${qtdeclarative}/lib/qt5/qml" - wrapProgram $out/bin/qtcreator \ - --prefix QT_PLUGIN_PATH : "$QT_PLUGIN_PATH" \ - --prefix QML_IMPORT_PATH : "$QML_IMPORT_PATH" \ - --prefix QML2_IMPORT_PATH : "$QML2_IMPORT_PATH" + wrapQtProgram $out/bin/qtcreator ''; meta = { From f3e8653647f62088e5a6835d96fcc0be0bc631c2 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 17 Apr 2016 02:50:54 +0300 Subject: [PATCH 089/103] valkyrie: move to qmake4Hook --- pkgs/development/tools/analysis/valkyrie/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/analysis/valkyrie/default.nix b/pkgs/development/tools/analysis/valkyrie/default.nix index 76becca74cf..1da6c6a1e86 100644 --- a/pkgs/development/tools/analysis/valkyrie/default.nix +++ b/pkgs/development/tools/analysis/valkyrie/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, qt4 }: +{ stdenv, fetchurl, qt4, qmake4Hook }: stdenv.mkDerivation rec { name = "valkyrie-2.0.0"; @@ -9,8 +9,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ qt4 ]; - - configurePhase = "qmake PREFIX=$out"; + nativeBuildInputs = [ qmake4Hook ]; meta = { homepage = http://www.valgrind.org/; From f8d96d19836d010cecdb902917b5037118e0691f Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 17 Apr 2016 02:51:03 +0300 Subject: [PATCH 090/103] chessx: move to qmakeHook --- pkgs/games/chessx/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/games/chessx/default.nix b/pkgs/games/chessx/default.nix index 39ec3670e54..63a1adb7155 100644 --- a/pkgs/games/chessx/default.nix +++ b/pkgs/games/chessx/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgconfig, zlib, qtbase, qtsvg, qttools, qtmultimedia, fetchurl }: +{ stdenv, pkgconfig, zlib, qtbase, qtsvg, qttools, qtmultimedia, qmakeHook, fetchurl }: stdenv.mkDerivation rec { name = "chessx-${version}"; version = "1.3.2"; @@ -6,9 +6,6 @@ stdenv.mkDerivation rec { url = "mirror://sourceforge/chessx/chessx-${version}.tgz"; sha256 = "b136cf56d37d34867cdb9538176e1703b14f61b3384885b6f100580d0af0a3ff"; }; - preConfigure = '' - qmake -spec linux-g++ chessx.pro - ''; buildInputs = [ stdenv pkgconfig @@ -17,6 +14,7 @@ stdenv.mkDerivation rec { qttools qtmultimedia zlib + qmakeHook ]; enableParallelBuilding = true; From 02014ea0aaf59e92dcd69d61445f488b1aa9b683 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 17 Apr 2016 02:51:15 +0300 Subject: [PATCH 091/103] mudlet: move to qmakeHook --- pkgs/games/mudlet/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/games/mudlet/default.nix b/pkgs/games/mudlet/default.nix index 8b51d617403..d684cc22c38 100644 --- a/pkgs/games/mudlet/default.nix +++ b/pkgs/games/mudlet/default.nix @@ -1,5 +1,5 @@ -{ fetchurl, pkgs, stdenv, makeWrapper, qtbase, yajl, libzip, hunspell -, boost, lua5_1, luafilesystem, luazip, lrexlib, luasqlite3 }: +{ fetchurl, unzip, stdenv, makeWrapper, qtbase, yajl, libzip, hunspell +, boost, lua5_1, luafilesystem, luazip, lrexlib, luasqlite3, qmakeHook }: stdenv.mkDerivation rec { name = "mudlet-${version}"; @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { }; buildInputs = [ - pkgs.unzip qtbase lua5_1 hunspell libzip yajl boost makeWrapper - luafilesystem luazip lrexlib luasqlite3 + unzip qtbase lua5_1 hunspell libzip yajl boost makeWrapper + luafilesystem luazip lrexlib luasqlite3 qmakeHook ]; - configurePhase = "cd src && qmake"; + preConfigure = "cd src"; installPhase = let luaZipPath = "${luazip}/lib/lua/5.1/?.so"; From 34625f646c6407a354bc8ecaa17e204aa0b0e616 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 17 Apr 2016 02:51:25 +0300 Subject: [PATCH 092/103] ppsspp: move to qmake4Hook --- pkgs/misc/emulators/ppsspp/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/emulators/ppsspp/default.nix b/pkgs/misc/emulators/ppsspp/default.nix index 439566de0ca..87ae977c7cc 100644 --- a/pkgs/misc/emulators/ppsspp/default.nix +++ b/pkgs/misc/emulators/ppsspp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, zlib, libpng, qt4, pkgconfig +{ stdenv, fetchgit, zlib, libpng, qt4, qmake4Hook, pkgconfig , withGamepads ? true, SDL # SDL is used for gamepad functionality }: @@ -19,10 +19,10 @@ stdenv.mkDerivation rec{ sha256 = "71dfa0be045f31969b1d6ab4f1adf6a208f9ef4834d708bc7bf6d9195efb5f80"; }; - buildInputs = [ zlib libpng pkgconfig qt4 ] + buildInputs = [ zlib libpng pkgconfig qt4 qmake4Hook ] ++ (if withGamepads then [ SDL ] else [ ]); - configurePhase = "cd Qt && qmake PPSSPPQt.pro"; + preConfigure = "cd Qt"; installPhase = "mkdir -p $out/bin && cp ppsspp $out/bin"; meta = { From de1ce6a102a53881fffff61b3888babf32320899 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 17 Apr 2016 02:51:46 +0300 Subject: [PATCH 093/103] l7z: spaces --- pkgs/os-specific/linux/i7z/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/i7z/default.nix b/pkgs/os-specific/linux/i7z/default.nix index 1fe1f48f4ef..1ca200a1121 100644 --- a/pkgs/os-specific/linux/i7z/default.nix +++ b/pkgs/os-specific/linux/i7z/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, qt4, ncurses}: +{ stdenv, fetchurl, qt4, ncurses }: stdenv.mkDerivation rec { name = "i7z-0.27.2"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1wa7ix6m75wl3k2n88sz0x8cckvlzqklja2gvzqfw5rcfdjjvxx7"; }; - buildInputs = [qt4 ncurses]; + buildInputs = [ qt4 ncurses ]; buildPhase = '' make From e282d36143ea73756da19917fba53614118cc1fd Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 17 Apr 2016 02:51:59 +0300 Subject: [PATCH 094/103] wpa_supplicant_gui: move to qmake4Hook --- pkgs/os-specific/linux/wpa_supplicant/gui.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/wpa_supplicant/gui.nix b/pkgs/os-specific/linux/wpa_supplicant/gui.nix index 59a3c51c4d6..a75367f0bb0 100644 --- a/pkgs/os-specific/linux/wpa_supplicant/gui.nix +++ b/pkgs/os-specific/linux/wpa_supplicant/gui.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, qt4, inkscape, wpa_supplicant }: +{ stdenv, fetchurl, qt4, qmake4Hook, inkscape, wpa_supplicant }: stdenv.mkDerivation { name = "wpa_gui-${wpa_supplicant.version}"; @@ -7,14 +7,13 @@ stdenv.mkDerivation { buildInputs = [ qt4 ]; - nativeBuildInputs = [ inkscape ]; + nativeBuildInputs = [ inkscape qmake4Hook ]; prePatch = "cd wpa_supplicant/wpa_gui-qt4"; - configurePhase = + preConfigure = '' lrelease wpa_gui.pro - qmake ''; # We do not install .xpm icons. First of all, I don't know where they should From c48dd664ffb3ec497a1af400c9c2db95c23e9879 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 17 Apr 2016 02:52:09 +0300 Subject: [PATCH 095/103] jom: move to qmake4Hook --- pkgs/os-specific/windows/jom/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/windows/jom/default.nix b/pkgs/os-specific/windows/jom/default.nix index 4b118a5a7cd..6537503add8 100644 --- a/pkgs/os-specific/windows/jom/default.nix +++ b/pkgs/os-specific/windows/jom/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, qt48, flex, cmake }: +{ stdenv, fetchgit, qt48, qmake4Hook, flex }: # At the time of committing this, the expression fails for me to cross-build in # both mingw32 and mingw64. @@ -13,12 +13,9 @@ stdenv.mkDerivation { }; buildInputs = [ qt48 ]; - nativeBuildInputs = [ flex /*cmake*/ ]; + nativeBuildInputs = [ flex qmake4Hook ]; QTDIR = qt48; - configurePhase = '' - qmake PREFIX=$out - ''; crossAttrs = { # cmakeFlags = "-DWIN32=1 -DCMAKE_SYSTEM_NAME=Windows -DCMAKE_RC_COMPILER=${stdenv.cross.config}-windres"; From a3a40c027c1ed3d07ebb76d885e25f95cdfa5e54 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 17 Apr 2016 02:52:16 +0300 Subject: [PATCH 096/103] qastools: move to qmake4Hook --- pkgs/tools/audio/qastools/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/audio/qastools/default.nix b/pkgs/tools/audio/qastools/default.nix index 3743b38a210..3fe5b4b8d1a 100644 --- a/pkgs/tools/audio/qastools/default.nix +++ b/pkgs/tools/audio/qastools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, alsaLib, udev, qt }: +{ stdenv, fetchurl, cmake, alsaLib, udev, qt4 }: let version = "0.18.1"; @@ -13,7 +13,7 @@ stdenv.mkDerivation { }; buildInputs = [ - cmake alsaLib udev qt + cmake alsaLib udev qt4 ]; cmakeFlags = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e02186c5212..55c5d4a54fb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2970,9 +2970,7 @@ in qalculate-gtk = callPackage ../applications/science/math/qalculate-gtk { }; - qastools = callPackage ../tools/audio/qastools { - qt = qt4; - }; + qastools = callPackage ../tools/audio/qastools { }; qgifer = callPackage ../applications/video/qgifer { giflib = giflib_4_1; From cef0e565e3b983942582ee14867655b69703ba52 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 17 Apr 2016 02:52:24 +0300 Subject: [PATCH 097/103] unetbootin: move to qmake4Hook --- pkgs/tools/cd-dvd/unetbootin/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/cd-dvd/unetbootin/default.nix b/pkgs/tools/cd-dvd/unetbootin/default.nix index 1234ecd770b..bf8cefd057e 100644 --- a/pkgs/tools/cd-dvd/unetbootin/default.nix +++ b/pkgs/tools/cd-dvd/unetbootin/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, qt4, utillinux, coreutils, which +{ stdenv, fetchurl, makeWrapper, qt4, utillinux, coreutils, which, qmake4Hook , p7zip, mtools, syslinux }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sourceRoot = "."; - buildInputs = [ makeWrapper qt4 ]; + buildInputs = [ makeWrapper qt4 qmake4Hook ]; # Lots of nice hard-coded paths... postUnpack = '' @@ -30,11 +30,9 @@ stdenv.mkDerivation rec { --replace /usr/bin $out/bin ''; - buildPhase = '' + preConfigure = '' lupdate unetbootin.pro lrelease unetbootin.pro - qmake - make ''; installPhase = '' From 5a4cccd7e7f26361fc3829b8867474915d393b90 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 17 Apr 2016 02:52:35 +0300 Subject: [PATCH 098/103] nifskope: move to qmake4Hook --- pkgs/tools/graphics/nifskope/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/graphics/nifskope/default.nix b/pkgs/tools/graphics/nifskope/default.nix index 13dc27921a4..decd6fb56fd 100644 --- a/pkgs/tools/graphics/nifskope/default.nix +++ b/pkgs/tools/graphics/nifskope/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, qt4 }: +{ stdenv, fetchurl, qt4, qmake4Hook }: stdenv.mkDerivation rec { name = "nifskope-1.1.3"; @@ -10,14 +10,16 @@ stdenv.mkDerivation rec { buildInputs = [ qt4 ]; - configurePhase = + nativeBuildInputs = [ qmake4Hook ]; + + preConfigure = '' for i in *.cpp gl/*.cpp widgets/*.cpp; do substituteInPlace $i --replace /usr/share/nifskope $out/share/nifskope done + ''; - qmake -after TARGET=nifskope - ''; # */ + qmakeFlags = [ "-after TARGET=nifskope" ]; enableParallelBuilding = true; From 6adce0a785b2876f48a9d73c02251b101f69c30b Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 17 Apr 2016 02:52:46 +0300 Subject: [PATCH 099/103] touchegg: move to qmake4Hook --- pkgs/tools/inputmethods/touchegg/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/inputmethods/touchegg/default.nix b/pkgs/tools/inputmethods/touchegg/default.nix index 4ac3c02d410..6ab53f9d763 100644 --- a/pkgs/tools/inputmethods/touchegg/default.nix +++ b/pkgs/tools/inputmethods/touchegg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, xorg, xorgserver, qt4, mesa, geis }: +{ stdenv, fetchurl, xorg, xorgserver, qt4, mesa, geis, qmake4Hook }: stdenv.mkDerivation rec { name = "touchegg-${version}"; @@ -10,10 +10,11 @@ stdenv.mkDerivation rec { buildInputs = [ xorgserver mesa xorg.libX11 xorg.libXtst xorg.libXext qt4 geis ]; - configurePhase = '' + nativeBuildInputs = [ qmake4Hook ]; + + preConfigure = '' sed -e "s@/usr/@$out/@g" -i $(find . -name touchegg.pro) sed -e "s@/usr/@$out/@g" -i $(find ./src/touchegg/config/ -name Config.cpp) - qmake touchegg.pro ''; meta = { @@ -22,4 +23,4 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; }; -} \ No newline at end of file +} From ea56bb7331221efa6be1bc290cd6ee8b6be17536 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 17 Apr 2016 02:52:55 +0300 Subject: [PATCH 100/103] rockbox-utility: move to qmake4Hook --- pkgs/tools/misc/rockbox-utility/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/rockbox-utility/default.nix b/pkgs/tools/misc/rockbox-utility/default.nix index c9c0cf6949f..54a6b0309b0 100644 --- a/pkgs/tools/misc/rockbox-utility/default.nix +++ b/pkgs/tools/misc/rockbox-utility/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libusb1, qt4 }: +{ stdenv, fetchurl, libusb1, qt4, qmake4Hook }: stdenv.mkDerivation rec { name = "rockbox-utility-${version}"; @@ -10,10 +10,10 @@ stdenv.mkDerivation rec { }; buildInputs = [ libusb1 qt4 ]; + nativeBuildInputs = [ qmake4Hook ]; - preBuild = '' + preConfigure = '' cd rbutil/rbutilqt - qmake ''; installPhase = '' From 8ab48c32e7a3053ea5198c22c5881c93644c8a9c Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 17 Apr 2016 02:53:07 +0300 Subject: [PATCH 101/103] yubikey-personalization-gui: move to qmake4Hook --- .../tools/misc/yubikey-personalization-gui/default.nix | 10 +++------- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/pkgs/tools/misc/yubikey-personalization-gui/default.nix b/pkgs/tools/misc/yubikey-personalization-gui/default.nix index 57952b80daf..4bc68aba29d 100644 --- a/pkgs/tools/misc/yubikey-personalization-gui/default.nix +++ b/pkgs/tools/misc/yubikey-personalization-gui/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, yubikey-personalization, qt, libyubikey }: +{ stdenv, fetchurl, pkgconfig, yubikey-personalization, qt4, qmake4Hook, libyubikey }: stdenv.mkDerivation rec { name = "yubikey-personalization-gui-3.1.24"; @@ -8,13 +8,9 @@ stdenv.mkDerivation rec { sha256 = "0aj8cvajswkwzig0py0mjnfw0m8xsilisdcnixpjx9xxsxz5yacq"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ yubikey-personalization qt libyubikey ]; + nativeBuildInputs = [ pkgconfig qmake4Hook ]; + buildInputs = [ yubikey-personalization qt4 libyubikey ]; - configurePhase = '' - qmake - ''; - installPhase = '' mkdir -p $out/bin cp build/release/yubikey-personalization-gui $out/bin diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 55c5d4a54fb..7eb9741b240 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9162,9 +9162,7 @@ in libusb = libusb1; }; - yubikey-personalization-gui = callPackage ../tools/misc/yubikey-personalization-gui { - qt = qt4; - }; + yubikey-personalization-gui = callPackage ../tools/misc/yubikey-personalization-gui { }; zeitgeist = callPackage ../development/libraries/zeitgeist { }; From 294d1f4c704fd82f25ea9652a3a30811ae082aa0 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 16 Apr 2016 22:59:17 +0300 Subject: [PATCH 102/103] cmst: move to qmakeHook This reverts commit 2c024d28a219f3283d8adb10049162bd45332eb8. --- pkgs/tools/networking/cmst/default.nix | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/pkgs/tools/networking/cmst/default.nix b/pkgs/tools/networking/cmst/default.nix index 5c8b801dbbe..d9c6c2630fa 100644 --- a/pkgs/tools/networking/cmst/default.nix +++ b/pkgs/tools/networking/cmst/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, qtbase, makeWrapper, libX11 }: +{ stdenv, fetchFromGitHub, qtbase, qmakeHook, makeWrapper, libX11 }: stdenv.mkDerivation rec { name = "cmst-2016.01.28"; @@ -10,10 +10,9 @@ stdenv.mkDerivation rec { owner = "andrew-bibb"; }; - buildInputs = [ qtbase makeWrapper ]; + buildInputs = [ qtbase makeWrapper qmakeHook ]; - configurePhase = '' - runHook preConfigure + preConfigure = '' substituteInPlace ./cmst.pro \ --replace "/usr/bin" "$out/bin" \ --replace "/usr/share" "$out/usr/share" @@ -29,14 +28,6 @@ stdenv.mkDerivation rec { substituteInPlace ./apps/rootapp/rootapp.pro \ --replace "/etc" "$out/etc" \ --replace "/usr/share" "$out/share" - runHook postConfigure - ''; - - buildPhase = '' - runHook preBuild - qmake PREFIX=$out - make - runHook postBuild ''; postInstall = '' From 039ff272ee979e536e0e3a24bfb7bd63c26701fc Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 20 Apr 2016 19:02:13 +0300 Subject: [PATCH 103/103] qt55: remove configureScript from qt5Submodule --- pkgs/development/libraries/qt-5/5.5/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/libraries/qt-5/5.5/default.nix b/pkgs/development/libraries/qt-5/5.5/default.nix index abbbe8ef7a0..034e25662ea 100644 --- a/pkgs/development/libraries/qt-5/5.5/default.nix +++ b/pkgs/development/libraries/qt-5/5.5/default.nix @@ -46,7 +46,6 @@ let NIX_QT_SUBMODULE = args.NIX_QT_SUBMODULE or true; dontFixLibtool = args.dontFixLibtool or true; - configureScript = args.configureScript or "qmake"; outputs = args.outputs or [ "dev" "out" ]; setOutputFlags = args.setOutputFlags or false;