diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2016-04-17 02:35:53 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2016-04-20 18:55:45 +0300 |
| commit | 46cf871c3d40ec8f7774302e3e2cb7c9c371053c (patch) | |
| tree | b4a0538dd021ed598d3319d59ac12eb23702f44f /pkgs/applications/networking/instant-messengers/ricochet | |
| parent | 87397b770c4b9dbd2faef8c6c2df021048c2aa83 (diff) | |
ricochet: move to qmakeHook
Diffstat (limited to 'pkgs/applications/networking/instant-messengers/ricochet')
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/ricochet/default.nix | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/pkgs/applications/networking/instant-messengers/ricochet/default.nix b/pkgs/applications/networking/instant-messengers/ricochet/default.nix index 81e8d1b76a9cd..52da021000db5 100644 --- a/pkgs/applications/networking/instant-messengers/ricochet/default.nix +++ b/pkgs/applications/networking/instant-messengers/ricochet/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, makeDesktopItem, unzip , qtbase, qttools, makeQtWrapper, qtmultimedia, qtquick1, qtquickcontrols -, openssl, protobuf +, openssl, protobuf, qmakeHook }: stdenv.mkDerivation rec { @@ -27,15 +27,13 @@ stdenv.mkDerivation rec { openssl protobuf ]; - nativeBuildInputs = [ pkgconfig makeQtWrapper ]; + nativeBuildInputs = [ pkgconfig makeQtWrapper qmakeHook ]; preConfigure = '' export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags openssl)" ''; - configureScript = "qmake"; - dontAddPrefix = true; - configureFlags = [ "PREFIX=$(out)" "DEFINES+=RICOCHET_NO_PORTABLE" ]; + qmakeFlags = [ "DEFINES+=RICOCHET_NO_PORTABLE" ]; installPhase = '' mkdir -p $out/bin |