From adf81192c6e15d80c803c238cfe4a7fe916938df Mon Sep 17 00:00:00 2001 From: Christoph Ruegge Date: Tue, 22 Oct 2019 15:36:52 +0200 Subject: [PATCH 1/2] texmaker: use qt5 mkDerivation --- pkgs/applications/editors/texmaker/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/texmaker/default.nix b/pkgs/applications/editors/texmaker/default.nix index 2a4459ddc3e..a4bc4dc0321 100644 --- a/pkgs/applications/editors/texmaker/default.nix +++ b/pkgs/applications/editors/texmaker/default.nix @@ -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"; version = "5.0.3"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "TeX and LaTeX editor"; longDescription='' This editor is a full fledged IDE for TeX and From 97f734a4f15fba8f962b3808a94b5979db46d114 Mon Sep 17 00:00:00 2001 From: Christoph Ruegge Date: Tue, 22 Oct 2019 17:27:47 +0200 Subject: [PATCH 2/2] texmaker: avoid shell expansion when setting qmakeFlags --- pkgs/applications/editors/texmaker/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/editors/texmaker/default.nix b/pkgs/applications/editors/texmaker/default.nix index a4bc4dc0321..71043cb78fe 100644 --- a/pkgs/applications/editors/texmaker/default.nix +++ b/pkgs/applications/editors/texmaker/default.nix @@ -13,10 +13,11 @@ mkDerivation rec { nativeBuildInputs = [ pkgconfig poppler qmake ]; NIX_CFLAGS_COMPILE="-I${poppler.dev}/include/poppler"; - preConfigure = '' - qmakeFlags="$qmakeFlags DESKTOPDIR=$out/share/applications ICONDIR=$out/share/pixmaps METAINFODIR=$out/share/metainfo" - ''; - + qmakeFlags = [ + "DESKTOPDIR=${placeholder "out"}/share/applications" + "ICONDIR=${placeholder "out"}/share/pixmaps" + "METAINFODIR=${placeholder "out"}/share/metainfo" + ]; enableParallelBuilding = true;