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

texmaker: move to qmake4Hook

Browse Source
This commit is contained in:
Nikolay Amiantov 2016-04-17 02:26:57 +03:00
parent 448100fe83
commit b1dcfeeeeb
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/editors/texmaker/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, qt4, poppler_qt4, zlib, pkgconfig, poppler}: { stdenv, fetchurl, qt4, qmake4Hook, poppler_qt4, zlib, pkgconfig, poppler }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "texmaker"; pname = "texmaker";
@ -11,11 +11,11 @@ stdenv.mkDerivation rec {
}; };
buildInputs = [ qt4 poppler_qt4 zlib ]; buildInputs = [ qt4 poppler_qt4 zlib ];
nativeBuildInputs = [ pkgconfig poppler ]; nativeBuildInputs = [ pkgconfig poppler qmake4Hook ];
NIX_CFLAGS_COMPILE="-I${poppler}/include/poppler"; NIX_CFLAGS_COMPILE="-I${poppler}/include/poppler";
preConfigure = '' preConfigure = ''
qmake PREFIX=$out DESKTOPDIR=$out/share/applications ICONDIR=$out/share/pixmaps texmaker.pro qmakeFlags="$qmakeFlags DESKTOPDIR=$out/share/applications ICONDIR=$out/share/pixmaps"
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {