git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #72095 from jokogr/f/qt5ct-qmakeflags

qt5ct: qtsvg, qmakeFlags nixification

commitf3a97b24cd3353b4eb6c3cd91723619790940439 authorDmitry Kalinkin <dmitry.kalinkin@gmail.com> dateSun 27 Oct 2019, 15:10 (7 years ago) parent4aaf2ad81fed28
1 file changed+3−6
pkgs/tools/misc/qt5ct/default.nix+3−6
pkgs/tools/misc/qt5ct/default.nix+3−6
@@ -1,4 +1,4 @@
1−{ mkDerivation, lib, fetchurl, qtbase, qttools, qmake }:
1+{ mkDerivation, lib, fetchurl, qtbase, qtsvg, qttools, qmake }:
22
33let inherit (lib) getDev; in
44
@@ -13,16 +13,13 @@ mkDerivation rec {
1313
1414 nativeBuildInputs = [ qmake qttools ];
1515
16− buildInputs = [ qtbase ];
16+ buildInputs = [ qtbase qtsvg ];
1717
1818 qmakeFlags = [
1919 "LRELEASE_EXECUTABLE=${getDev qttools}/bin/lrelease"
20+ "PLUGINDIR=${placeholder "out"}/${qtbase.qtPluginPrefix}"
2021 ];
2122
22− preConfigure = ''
23− qmakeFlags+=" PLUGINDIR=$out/$qtPluginPrefix"
24− '';
25−
2623 enableParallelBuilding = true;
2724
2825 meta = with lib; {