From 4f9fae2e327f12fa89e44a37a25d129d50e47ec0 Mon Sep 17 00:00:00 2001 From: Alexandre Joannou Date: Wed, 13 Nov 2019 05:13:48 +0000 Subject: [PATCH] texstudio: fix qt wrapping and explicitly receive qt attributes (#73298) --- pkgs/applications/editors/texstudio/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/editors/texstudio/default.nix b/pkgs/applications/editors/texstudio/default.nix index 04e2cb45e28..f986d79ec50 100644 --- a/pkgs/applications/editors/texstudio/default.nix +++ b/pkgs/applications/editors/texstudio/default.nix @@ -1,6 +1,7 @@ -{ stdenv, fetchFromGitHub, qt5, poppler, zlib, pkgconfig}: +{ lib, mkDerivation, fetchFromGitHub, qmake, qtbase, qtscript, qtsvg, + poppler, zlib, pkgconfig }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "texstudio"; version = "2.12.16"; @@ -11,12 +12,12 @@ stdenv.mkDerivation rec { sha256 = "0ck65fvz6mzfpqdb1ndgyvgxdnslrwhdr1swgck4gaghcrgbg3gq"; }; - nativeBuildInputs = [ qt5.qmake pkgconfig ]; - buildInputs = [ qt5.qtbase qt5.qtscript qt5.qtsvg poppler zlib ]; + nativeBuildInputs = [ qmake pkgconfig ]; + buildInputs = [ qtbase qtscript qtsvg poppler zlib ]; qmakeFlags = [ "NO_APPDATA=True" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "TeX and LaTeX editor"; longDescription='' Fork of TeXMaker, this editor is a full fledged IDE for