diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2016-04-16 22:59:19 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2016-04-20 18:55:39 +0300 |
| commit | eb3a5a300213f7bebade0ef60a7492b012f6b402 (patch) | |
| tree | 2ba007164316227bbc2d0a921bf74075d53deaf5 /pkgs | |
| parent | 222c4a221eb0ed6498d47562b51fe7b203984747 (diff) | |
| download | nixlib-eb3a5a300213f7bebade0ef60a7492b012f6b402.tar nixlib-eb3a5a300213f7bebade0ef60a7492b012f6b402.tar.gz nixlib-eb3a5a300213f7bebade0ef60a7492b012f6b402.tar.bz2 nixlib-eb3a5a300213f7bebade0ef60a7492b012f6b402.tar.lz nixlib-eb3a5a300213f7bebade0ef60a7492b012f6b402.tar.xz nixlib-eb3a5a300213f7bebade0ef60a7492b012f6b402.tar.zst nixlib-eb3a5a300213f7bebade0ef60a7492b012f6b402.zip | |
iannix: move to qmakeHook
This reverts commit bb543e1540e0e70180e60285b7a353f0c32dc101.
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/audio/iannix/default.nix | 10 | ||||
| -rw-r--r-- | 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 f17abf975218..83fd2b14ed2e 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 dd2abaa4dc43..90d766c925a7 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 { }; |