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

ricochet: move to qmakeHook

Browse Source
This commit is contained in:
Nikolay Amiantov 2016-04-17 02:35:53 +03:00
parent 87397b770c
commit 46cf871c3d
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/applications/networking/instant-messengers/ricochet/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, pkgconfig, makeDesktopItem, unzip { stdenv, fetchurl, pkgconfig, makeDesktopItem, unzip
, qtbase, qttools, makeQtWrapper, qtmultimedia, qtquick1, qtquickcontrols , qtbase, qttools, makeQtWrapper, qtmultimedia, qtquick1, qtquickcontrols
, openssl, protobuf , openssl, protobuf, qmakeHook
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -27,15 +27,13 @@ stdenv.mkDerivation rec {
openssl protobuf openssl protobuf
]; ];
nativeBuildInputs = [ pkgconfig makeQtWrapper ]; nativeBuildInputs = [ pkgconfig makeQtWrapper qmakeHook ];
preConfigure = '' preConfigure = ''
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags openssl)" export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags openssl)"
''; '';
configureScript = "qmake"; qmakeFlags = [ "DEFINES+=RICOCHET_NO_PORTABLE" ];
dontAddPrefix = true;
configureFlags = [ "PREFIX=$(out)" "DEFINES+=RICOCHET_NO_PORTABLE" ];
installPhase = '' installPhase = ''
mkdir -p $out/bin mkdir -p $out/bin