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

qtox: move to qmakeHook

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

16
pkgs/applications/networking/instant-messengers/qtox/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, pkgconfig, libtoxcore-dev, openal, opencv, { stdenv, fetchFromGitHub, pkgconfig, libtoxcore-dev, openal, opencv,
libsodium, libXScrnSaver, glib, gdk_pixbuf, gtk2, cairo, libsodium, libXScrnSaver, glib, gdk_pixbuf, gtk2, cairo,
pango, atk, qrencode, ffmpeg, filter-audio, makeWrapper, pango, atk, qrencode, ffmpeg, filter-audio, makeQtWrapper,
qtbase, qtsvg, qttools, qttranslations, sqlcipher }: qtbase, qtsvg, qttools, qmakeHook, qttranslations, sqlcipher }:
let let
version = "1.3.0"; version = "1.3.0";
@ -22,11 +22,11 @@ stdenv.mkDerivation rec {
[ [
libtoxcore-dev openal opencv libsodium filter-audio libtoxcore-dev openal opencv libsodium filter-audio
qtbase qttools qtsvg libXScrnSaver glib gtk2 cairo qtbase qttools qtsvg libXScrnSaver glib gtk2 cairo
pango atk qrencode ffmpeg qttranslations makeWrapper pango atk qrencode ffmpeg qttranslations makeQtWrapper
sqlcipher sqlcipher
]; ];
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig qmakeHook ];
preConfigure = '' preConfigure = ''
# patch .pro file for proper set of the git hash # patch .pro file for proper set of the git hash
@ -42,16 +42,10 @@ stdenv.mkDerivation rec {
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags sqlcipher)" export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags sqlcipher)"
''; '';
configurePhase = ''
runHook preConfigure
qmake
'';
installPhase = '' installPhase = ''
mkdir -p $out/bin mkdir -p $out/bin
cp qtox $out/bin cp qtox $out/bin
wrapProgram $out/bin/qtox \ wrapQtProgram $out/bin/qtox
--prefix QT_PLUGIN_PATH : ${qtsvg}/lib/qt5/plugins
''; '';
enableParallelBuilding = true; enableParallelBuilding = true;