diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2016-07-18 00:11:24 +0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-18 00:11:24 +0400 |
| commit | aefd8c420c00d97c22375b647e9053691fe4ba28 (patch) | |
| tree | 000a2c4c5fb5da63fd2eb0ad86ce32533f22277c /pkgs | |
| parent | 540f4a8eab0718d3c8a19c827669e676fa97300e (diff) | |
| parent | 615d818964e9401726890c85735739742cd979af (diff) | |
| download | nixlib-aefd8c420c00d97c22375b647e9053691fe4ba28.tar nixlib-aefd8c420c00d97c22375b647e9053691fe4ba28.tar.gz nixlib-aefd8c420c00d97c22375b647e9053691fe4ba28.tar.bz2 nixlib-aefd8c420c00d97c22375b647e9053691fe4ba28.tar.lz nixlib-aefd8c420c00d97c22375b647e9053691fe4ba28.tar.xz nixlib-aefd8c420c00d97c22375b647e9053691fe4ba28.tar.zst nixlib-aefd8c420c00d97c22375b647e9053691fe4ba28.zip | |
Merge pull request #17043 from womfoo/fix/qmake4Hook-builds
reintroduce qmake .pro files after qmake4Hook changes
Diffstat (limited to 'pkgs')
4 files changed, 16 insertions, 0 deletions
diff --git a/pkgs/applications/misc/multimon-ng/default.nix b/pkgs/applications/misc/multimon-ng/default.nix index a9f0cb2511a4..8e39c258333a 100644 --- a/pkgs/applications/misc/multimon-ng/default.nix +++ b/pkgs/applications/misc/multimon-ng/default.nix @@ -16,6 +16,8 @@ stdenv.mkDerivation { nativeBuildInputs = [ qmake4Hook ]; + qmakeFlags = [ "multimon-ng.pro" ]; + installPhase = '' mkdir -p $out/bin cp multimon-ng $out/bin diff --git a/pkgs/applications/science/electronics/fritzing/default.nix b/pkgs/applications/science/electronics/fritzing/default.nix index 110759ea292c..3f80ed2866d3 100644 --- a/pkgs/applications/science/electronics/fritzing/default.nix +++ b/pkgs/applications/science/electronics/fritzing/default.nix @@ -9,8 +9,18 @@ stdenv.mkDerivation rec { sha256 = "181qnknq1j5x075icpw2qk0sc4wcj9f2hym533vs936is0wxp2gk"; }; + unpackPhase = '' + tar xjf ${src} + ''; + buildInputs = [ qtbase qtsvg boost qmakeHook ]; + qmakeFlags = [ "phoenix.pro" ]; + + preConfigure = '' + cd fritzing-${version}.source + ''; + meta = { description = "An open source prototyping tool for Arduino-based projects"; homepage = http://fritzing.org/; diff --git a/pkgs/applications/version-management/guitone/default.nix b/pkgs/applications/version-management/guitone/default.nix index 8731cbfde19b..8f8750b98c22 100644 --- a/pkgs/applications/version-management/guitone/default.nix +++ b/pkgs/applications/version-management/guitone/default.nix @@ -18,6 +18,8 @@ stdenv.mkDerivation rec { buildInputs = [ qt4 qmake4Hook pkgconfig graphviz ]; + qmakeFlags = [ "guitone.pro" ]; + meta = { description = "Qt4 based GUI for monotone"; homepage = http://guitone.thomaskeller.biz; diff --git a/pkgs/misc/emulators/ppsspp/default.nix b/pkgs/misc/emulators/ppsspp/default.nix index 68fb71050780..3f02304c0d42 100644 --- a/pkgs/misc/emulators/ppsspp/default.nix +++ b/pkgs/misc/emulators/ppsspp/default.nix @@ -22,6 +22,8 @@ stdenv.mkDerivation rec{ buildInputs = [ zlib libpng pkgconfig qt4 qmake4Hook ] ++ (if withGamepads then [ SDL ] else [ ]); + qmakeFlags = [ "PPSSPPQt.pro" ]; + preConfigure = "cd Qt"; installPhase = "mkdir -p $out/bin && cp ppsspp $out/bin"; |