From 81fed28811b06f2ab70d03f3e9a757f0ee40e086 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 1 Oct 2019 00:15:53 -0500 Subject: [PATCH] qt5ct: qtsvg, qmakeFlags nixification --- pkgs/tools/misc/qt5ct/default.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/misc/qt5ct/default.nix b/pkgs/tools/misc/qt5ct/default.nix index 952268b26f01..d7598b0c6dd5 100644 --- a/pkgs/tools/misc/qt5ct/default.nix +++ b/pkgs/tools/misc/qt5ct/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchurl, qtbase, qttools, qmake }: +{ mkDerivation, lib, fetchurl, qtbase, qtsvg, qttools, qmake }: let inherit (lib) getDev; in @@ -13,16 +13,13 @@ mkDerivation rec { nativeBuildInputs = [ qmake qttools ]; - buildInputs = [ qtbase ]; + buildInputs = [ qtbase qtsvg ]; qmakeFlags = [ "LRELEASE_EXECUTABLE=${getDev qttools}/bin/lrelease" + "PLUGINDIR=${placeholder "out"}/${qtbase.qtPluginPrefix}" ]; - preConfigure = '' - qmakeFlags+=" PLUGINDIR=$out/$qtPluginPrefix" - ''; - enableParallelBuilding = true; meta = with lib; {