public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

iannix: move to qmakeHook

Browse Source 
This reverts commit bb543e1540e0e70180e60285b7a353f0c32dc101.
This commit is contained in:
Nikolay Amiantov 2016-04-16 22:59:19 +03:00
parent 222c4a221e
commit eb3a5a3002
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/applications/audio/iannix/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, alsaLib, pkgconfig, qt5 { stdenv, fetchFromGitHub, alsaLib, pkgconfig, qtbase, qtscript, qmakeHook
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -11,13 +11,9 @@ stdenv.mkDerivation rec {
sha256 = "184ydb9f1303v332k5k3f1ki7cb6nkxhh6ij0yn72v7dp7figrgj"; sha256 = "184ydb9f1303v332k5k3f1ki7cb6nkxhh6ij0yn72v7dp7figrgj";
}; };
buildInputs = [ alsaLib pkgconfig qt5.qtbase qt5.qtscript ]; buildInputs = [ alsaLib pkgconfig qtbase qtscript qmakeHook ];
configurePhase = '' qmakeFlags = [ "PREFIX=/" ];
runHook preConfigure
qmake PREFIX=/
runHook postConfigure
'';
installFlags = [ "INSTALL_ROOT=$(out)" ]; installFlags = [ "INSTALL_ROOT=$(out)" ];

2
pkgs/top-level/all-packages.nix
View File

@ -1939,7 +1939,7 @@ in
iasl = callPackage ../development/compilers/iasl { }; iasl = callPackage ../development/compilers/iasl { };
iannix = callPackage ../applications/audio/iannix { }; iannix = qt5.callPackage ../applications/audio/iannix { };
icecast = callPackage ../servers/icecast { }; icecast = callPackage ../servers/icecast { };