Merge pull request #71675 from cruegge/texmaker-wrapqtappshook

texmaker: use wrapQtAppsHook
This commit is contained in:
markuskowa 2019-10-22 18:36:44 +02:00 committed by GitHub
commit a51a7187cb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, qtbase, qtscript, qmake, zlib, pkgconfig, poppler }: { lib, mkDerivation, fetchurl, qtbase, qtscript, qmake, zlib, pkgconfig, poppler }:
stdenv.mkDerivation rec { mkDerivation rec {
pname = "texmaker"; pname = "texmaker";
version = "5.0.3"; version = "5.0.3";
@ -13,14 +13,15 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig poppler qmake ]; nativeBuildInputs = [ pkgconfig poppler qmake ];
NIX_CFLAGS_COMPILE="-I${poppler.dev}/include/poppler"; NIX_CFLAGS_COMPILE="-I${poppler.dev}/include/poppler";
preConfigure = '' qmakeFlags = [
qmakeFlags="$qmakeFlags DESKTOPDIR=$out/share/applications ICONDIR=$out/share/pixmaps METAINFODIR=$out/share/metainfo" "DESKTOPDIR=${placeholder "out"}/share/applications"
''; "ICONDIR=${placeholder "out"}/share/pixmaps"
"METAINFODIR=${placeholder "out"}/share/metainfo"
];
enableParallelBuilding = true; enableParallelBuilding = true;
meta = with stdenv.lib; { meta = with lib; {
description = "TeX and LaTeX editor"; description = "TeX and LaTeX editor";
longDescription='' longDescription=''
This editor is a full fledged IDE for TeX and This editor is a full fledged IDE for TeX and