diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2016-04-17 02:26:57 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2016-04-20 18:55:39 +0300 |
| commit | b1dcfeeeebde011361d6a211fe4a3ab7eaee4a5a (patch) | |
| tree | 107fec611a3c68d4f5e2cdac981a6f7ebe73b324 /pkgs/applications/editors/texmaker | |
| parent | 448100fe83ac36a4355f5fa9136c2c77aac1270e (diff) | |
| download | nixpkgs-b1dcfeeeebde011361d6a211fe4a3ab7eaee4a5a.tar nixpkgs-b1dcfeeeebde011361d6a211fe4a3ab7eaee4a5a.tar.gz nixpkgs-b1dcfeeeebde011361d6a211fe4a3ab7eaee4a5a.tar.bz2 nixpkgs-b1dcfeeeebde011361d6a211fe4a3ab7eaee4a5a.tar.lz nixpkgs-b1dcfeeeebde011361d6a211fe4a3ab7eaee4a5a.tar.xz nixpkgs-b1dcfeeeebde011361d6a211fe4a3ab7eaee4a5a.tar.zst nixpkgs-b1dcfeeeebde011361d6a211fe4a3ab7eaee4a5a.zip | |
texmaker: move to qmake4Hook
Diffstat (limited to 'pkgs/applications/editors/texmaker')
| -rw-r--r-- | pkgs/applications/editors/texmaker/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/applications/editors/texmaker/default.nix b/pkgs/applications/editors/texmaker/default.nix index 04ebf195108..83165f0a505 100644 --- a/pkgs/applications/editors/texmaker/default.nix +++ b/pkgs/applications/editors/texmaker/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, qt4, poppler_qt4, zlib, pkgconfig, poppler}: +{ stdenv, fetchurl, qt4, qmake4Hook, poppler_qt4, zlib, pkgconfig, poppler }: stdenv.mkDerivation rec { pname = "texmaker"; @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { }; buildInputs = [ qt4 poppler_qt4 zlib ]; - nativeBuildInputs = [ pkgconfig poppler ]; + nativeBuildInputs = [ pkgconfig poppler qmake4Hook ]; NIX_CFLAGS_COMPILE="-I${poppler}/include/poppler"; 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; { |