From cb39af3ebdf37f2f8f7d8ea7e78ee84652706e1d Mon Sep 17 00:00:00 2001 From: Tad Fisher Date: Mon, 14 Oct 2019 13:55:11 -0700 Subject: [PATCH] plata-theme: Remove buildInputs; add GTK2 engines to path --- pkgs/data/themes/plata/default.nix | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/pkgs/data/themes/plata/default.nix b/pkgs/data/themes/plata/default.nix index 69e6f0bb0d2e..d3a01d45c0a3 100644 --- a/pkgs/data/themes/plata/default.nix +++ b/pkgs/data/themes/plata/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitLab, autoreconfHook, pkg-config, parallel -, sassc, inkscape, libxml2, glib, gdk-pixbuf, librsvg, gtk-engine-murrine +, sassc, inkscape, libxml2, glib, gtk2, gtk-engine-murrine , cinnamonSupport ? true , gnomeFlashbackSupport ? true , gnomeShellSupport ? true @@ -28,8 +28,6 @@ stdenv.mkDerivation rec { sha256 = "1sqmydvx36f6r4snw22s2q4dvcyg30jd7kg7dibpzqn3njfkkfag"; }; - preferLocalBuild = true; - nativeBuildInputs = [ autoreconfHook pkg-config @@ -42,13 +40,12 @@ stdenv.mkDerivation rec { ++ lib.optionals mateSupport [ gtk3 marco ] ++ lib.optional telegramSupport zip; - buildInputs = [ - gdk-pixbuf - librsvg + # GTK2 engines must be on the system path at runtime to be loaded. + propagatedUserEnvPkgs = [ + gtk2 + gtk-engine-murrine ]; - propagatedUserEnvPkgs = [ gtk-engine-murrine ]; - postPatch = "patchShebangs ."; configureFlags =