3
0
Fork 0
forked from mirrors/nixpkgs

Merge pull request #32867 from yegortimoshenko/20171219.103133/propagate-murrine

themes: propagate gtk-murrine-engine, resolves #16268
This commit is contained in:
Orivej Desh 2017-12-20 04:16:52 +00:00 committed by GitHub
commit c47ac0d8bf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 22 additions and 14 deletions

View file

@ -21,8 +21,9 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig intltool ]; nativeBuildInputs = [ pkgconfig intltool ];
buildInputs = [ mate.mate-icon-theme gtk2 gtk_engines gtk-engine-murrine buildInputs = [ mate.mate-icon-theme gtk2 gtk_engines gdk_pixbuf librsvg ];
gdk_pixbuf librsvg ];
propagatedUserEnvPkgs = [ gtk-engine-murrine ];
meta = { meta = {
description = "A set of themes from MATE"; description = "A set of themes from MATE";

View file

@ -27,9 +27,10 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
gdk_pixbuf gdk_pixbuf
librsvg librsvg
gtk-engine-murrine
]; ];
propagatedUserEnvPkgs = [ gtk-engine-murrine ];
postPatch = "patchShebangs ."; postPatch = "patchShebangs .";
configureFlags = [ configureFlags = [

View file

@ -4,8 +4,9 @@ let
# treat versions newer than 3.22 as 3.22 # treat versions newer than 3.22 as 3.22
gnomeVersion = if stdenv.lib.versionOlder "3.22" gnome3.version then "3.22" else gnome3.version; gnomeVersion = if stdenv.lib.versionOlder "3.22" gnome3.version then "3.22" else gnome3.version;
pname = "arc-theme"; pname = "arc-theme";
in
in stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
version = "2017-05-12"; version = "2017-05-12";
@ -17,8 +18,9 @@ in stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ autoreconfHook pkgconfig ]; nativeBuildInputs = [ autoreconfHook pkgconfig ];
buildInputs = [ gnome3.gtk ];
buildInputs = [ gtk-engine-murrine gnome3.gtk ]; propagatedUserEnvPkgs = [ gtk-engine-murrine ];
preferLocalBuild = true; preferLocalBuild = true;

View file

@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook ]; nativeBuildInputs = [ autoreconfHook ];
buildInputs = [ gtk-engine-murrine ]; propagatedUserEnvPkgs = [ gtk-engine-murrine ];
meta = { meta = {
description = "Dark Desktop Suite for Gtk, Xfce and Metacity"; description = "Dark Desktop Suite for Gtk, Xfce and Metacity";

View file

@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "1hb0y72fzmcj2yl6q7mbc0c7yxkd1qgnyw4vixdqxnxk2c82sxzw"; sha256 = "1hb0y72fzmcj2yl6q7mbc0c7yxkd1qgnyw4vixdqxnxk2c82sxzw";
}; };
buildInputs = [ gtk-engine-murrine ]; propagatedUserEnvPkgs = [ gtk-engine-murrine ];
makeFlags = [ "PREFIX=$(out)" ]; makeFlags = [ "PREFIX=$(out)" ];

View file

@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook sass glib libxml2 gdk_pixbuf librsvg ]; nativeBuildInputs = [ autoreconfHook sass glib libxml2 gdk_pixbuf librsvg ];
buildInputs = [ gtk-engine-murrine ]; propagatedUserEnvPkgs = [ gtk-engine-murrine ];
meta = { meta = {
description = "Grey and blue theme (Gtk, Xfce, Emerald, Metacity, Mutter, Unity)"; description = "Grey and blue theme (Gtk, Xfce, Emerald, Metacity, Mutter, Unity)";

View file

@ -13,7 +13,9 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ gnome3.glib libxml2 ]; nativeBuildInputs = [ gnome3.glib libxml2 ];
buildInputs = [ gnome3.gnome_themes_standard gtk-engine-murrine gdk_pixbuf librsvg ]; buildInputs = [ gnome3.gnome_themes_standard gdk_pixbuf librsvg ];
propagatedUserEnvPkgs = [ gtk-engine-murrine ];
dontBuild = true; dontBuild = true;

View file

@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "7e1983924b2d90e89eddb3da8f4c43dc1326fe138fd191c8212c7904dcd618b0"; sha256 = "7e1983924b2d90e89eddb3da8f4c43dc1326fe138fd191c8212c7904dcd618b0";
}; };
buildInputs = [ gtk-engine-murrine ]; propagatedUserEnvPkgs = [ gtk-engine-murrine ];
dontBuild = true; dontBuild = true;

View file

@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ sass glib libxml2 gdk_pixbuf ]; nativeBuildInputs = [ sass glib libxml2 gdk_pixbuf ];
buildInputs = [ gtk-engine-murrine ]; propagatedUserEnvPkgs = [ gtk-engine-murrine ];
postPatch = '' postPatch = ''
substituteInPlace Makefile --replace '$(DESTDIR)'/usr $out substituteInPlace Makefile --replace '$(DESTDIR)'/usr $out

View file

@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook pkgconfig ]; nativeBuildInputs = [ autoreconfHook pkgconfig ];
buildInputs = [ gtk-engine-murrine ]; propagatedUserEnvPkgs = [ gtk-engine-murrine ];
configureFlags = [ "--disable-unity" ]; configureFlags = [ "--disable-unity" ];

View file

@ -11,7 +11,9 @@ stdenv.mkDerivation rec {
sha256 = "1js92qq1zi3iq40nl6n0m52hhhn9ql9i7y8ycg8vw3w0v8xyb4km"; sha256 = "1js92qq1zi3iq40nl6n0m52hhhn9ql9i7y8ycg8vw3w0v8xyb4km";
}; };
buildInputs = [ gdk_pixbuf gtk_engines gtk-engine-murrine ]; buildInputs = [ gdk_pixbuf gtk_engines ];
propagatedUserEnvPkgs = [ gtk-engine-murrine ];
dontBuild = true; dontBuild = true;