From dd778f175671d295d98231109917cb12e8de3594 Mon Sep 17 00:00:00 2001 From: Kranium Gikos Mendoza Date: Sun, 17 Jul 2016 22:40:27 +0800 Subject: fritzing: fix qmake4Hook build pass phoenix.pro and return unpack logic which were removed in 0b88755 --- pkgs/applications/science/electronics/fritzing/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'pkgs') 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/; -- cgit 1.4.1 From 2d529cfebb720ebdbc4ca9b794887940c5ef0f5f Mon Sep 17 00:00:00 2001 From: Kranium Gikos Mendoza Date: Sun, 17 Jul 2016 22:41:34 +0800 Subject: guitone: fix qmake4Hook build pass guitone.pro which was removed in 9a8a4b6 --- pkgs/applications/version-management/guitone/default.nix | 2 ++ 1 file changed, 2 insertions(+) (limited to 'pkgs') 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; -- cgit 1.4.1 From 5609e0daa293573c0d2f27c541fbca7d345e6942 Mon Sep 17 00:00:00 2001 From: Kranium Gikos Mendoza Date: Sun, 17 Jul 2016 22:42:08 +0800 Subject: multimon-ng: fix qmake4Hook build pass multimon-ng.pro which was removed in fbb9263 --- pkgs/applications/misc/multimon-ng/default.nix | 2 ++ 1 file changed, 2 insertions(+) (limited to 'pkgs') 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 -- cgit 1.4.1 From 615d818964e9401726890c85735739742cd979af Mon Sep 17 00:00:00 2001 From: Kranium Gikos Mendoza Date: Sun, 17 Jul 2016 22:42:46 +0800 Subject: ppsspp: fix qmake4Hook build pass PPSSPPQt.pro which was removed in 34625f6 --- pkgs/misc/emulators/ppsspp/default.nix | 2 ++ 1 file changed, 2 insertions(+) (limited to 'pkgs') 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"; -- cgit 1.4.1