dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #17043 from womfoo/fix/qmake4Hook-builds

Browse Source 
reintroduce qmake .pro files after qmake4Hook changes
This commit is contained in:
Nikolay Amiantov 2016-07-18 00:11:24 +04:00 committed by GitHub
commit aefd8c420c
4 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/misc/multimon-ng/default.nix
View File

@ -16,6 +16,8 @@ stdenv.mkDerivation {
nativeBuildInputs = [ qmake4Hook ]; nativeBuildInputs = [ qmake4Hook ];
qmakeFlags = [ "multimon-ng.pro" ];
installPhase = '' installPhase = ''
mkdir -p $out/bin mkdir -p $out/bin
cp multimon-ng $out/bin cp multimon-ng $out/bin

10
pkgs/applications/science/electronics/fritzing/default.nix
View File

@ -9,8 +9,18 @@ stdenv.mkDerivation rec {
sha256 = "181qnknq1j5x075icpw2qk0sc4wcj9f2hym533vs936is0wxp2gk"; sha256 = "181qnknq1j5x075icpw2qk0sc4wcj9f2hym533vs936is0wxp2gk";
}; };
unpackPhase = ''
tar xjf ${src}
'';
buildInputs = [ qtbase qtsvg boost qmakeHook ]; buildInputs = [ qtbase qtsvg boost qmakeHook ];
qmakeFlags = [ "phoenix.pro" ];
preConfigure = ''
cd fritzing-${version}.source
'';
meta = { meta = {
description = "An open source prototyping tool for Arduino-based projects"; description = "An open source prototyping tool for Arduino-based projects";
homepage = http://fritzing.org/; homepage = http://fritzing.org/;

2
pkgs/applications/version-management/guitone/default.nix
View File

@ -18,6 +18,8 @@ stdenv.mkDerivation rec {
buildInputs = [ qt4 qmake4Hook pkgconfig graphviz ]; buildInputs = [ qt4 qmake4Hook pkgconfig graphviz ];
qmakeFlags = [ "guitone.pro" ];
meta = { meta = {
description = "Qt4 based GUI for monotone"; description = "Qt4 based GUI for monotone";
homepage = http://guitone.thomaskeller.biz; homepage = http://guitone.thomaskeller.biz;

2
pkgs/misc/emulators/ppsspp/default.nix
View File

@ -22,6 +22,8 @@ stdenv.mkDerivation rec{
buildInputs = [ zlib libpng pkgconfig qt4 qmake4Hook ] buildInputs = [ zlib libpng pkgconfig qt4 qmake4Hook ]
++ (if withGamepads then [ SDL ] else [ ]); ++ (if withGamepads then [ SDL ] else [ ]);
qmakeFlags = [ "PPSSPPQt.pro" ];
preConfigure = "cd Qt"; preConfigure = "cd Qt";
installPhase = "mkdir -p $out/bin && cp ppsspp $out/bin"; installPhase = "mkdir -p $out/bin && cp ppsspp $out/bin";