From 4afb28a89295d896077b5a8560d2c56527dda168 Mon Sep 17 00:00:00 2001 From: José Romildo Malaquias Date: Fri, 6 Oct 2017 21:49:05 -0300 Subject: flat-plat: 20170917 -> 20171005 and renamed to materia-theme --- pkgs/misc/themes/flat-plat/default.nix | 36 ------------------------------ pkgs/misc/themes/materia-theme/default.nix | 36 ++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 5 +++-- 3 files changed, 39 insertions(+), 38 deletions(-) delete mode 100644 pkgs/misc/themes/flat-plat/default.nix create mode 100644 pkgs/misc/themes/materia-theme/default.nix diff --git a/pkgs/misc/themes/flat-plat/default.nix b/pkgs/misc/themes/flat-plat/default.nix deleted file mode 100644 index cd652440efae..000000000000 --- a/pkgs/misc/themes/flat-plat/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ stdenv, fetchFromGitHub, gnome3, libxml2, gtk-engine-murrine, gdk_pixbuf, librsvg }: - -stdenv.mkDerivation rec { - name = "flat-plat-gtk-theme-${version}"; - version = "20170917"; - - src = fetchFromGitHub { - owner = "nana-4"; - repo = "Flat-Plat"; - rev = "v${version}"; - sha256 = "17r4wl27yx49xg0l3s5d67174r63p4cw6cbdmzl81if7iab69hv0"; - }; - - nativeBuildInputs = [ gnome3.glib libxml2 ]; - - buildInputs = [ gnome3.gnome_themes_standard gtk-engine-murrine gdk_pixbuf librsvg ]; - - dontBuild = true; - - installPhase = '' - patchShebangs install.sh - sed -i install.sh \ - -e "s|^gnomever=.*$|gnomever=${gnome3.version}|" \ - -e "s|/usr||" - destdir="$out" ./install.sh - rm $out/share/themes/*/COPYING - ''; - - meta = with stdenv.lib; { - description = "A Material Design-like theme for GTK+ based desktop environments"; - homepage = https://github.com/nana-4/Flat-Plat; - license = licenses.gpl2; - platforms = platforms.all; - maintainers = [ maintainers.mounium ]; - }; -} diff --git a/pkgs/misc/themes/materia-theme/default.nix b/pkgs/misc/themes/materia-theme/default.nix new file mode 100644 index 000000000000..755a0b737ca3 --- /dev/null +++ b/pkgs/misc/themes/materia-theme/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchFromGitHub, gnome3, libxml2, gtk-engine-murrine, gdk_pixbuf, librsvg }: + +stdenv.mkDerivation rec { + name = "materia-theme-${version}"; + version = "20171005"; + + src = fetchFromGitHub { + owner = "nana-4"; + repo = "materia-theme"; + rev = "v${version}"; + sha256 = "0znm7mx2nv2sgvy8fyams1ckp1ly3nbbs0k09d24w1zzd90xhzqp"; + }; + + nativeBuildInputs = [ gnome3.glib libxml2 ]; + + buildInputs = [ gnome3.gnome_themes_standard gtk-engine-murrine gdk_pixbuf librsvg ]; + + dontBuild = true; + + installPhase = '' + patchShebangs install.sh + sed -i install.sh \ + -e "s|^gnomever=.*$|gnomever=${gnome3.version}|" \ + -e "s|/usr||" + destdir="$out" ./install.sh + rm $out/share/themes/*/COPYING + ''; + + meta = with stdenv.lib; { + description = "A Material Design-like theme for GNOME/GTK+ based desktop environments (formerly Flat-Plat)"; + homepage = https://github.com/nana-4/materia-theme; + license = licenses.gpl2; + platforms = platforms.all; + maintainers = [ maintainers.mounium ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a9efda627134..1cef7b8b6f3c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18994,8 +18994,6 @@ with pkgs; fceux = callPackage ../misc/emulators/fceux { }; - flat-plat = callPackage ../misc/themes/flat-plat { }; - flockit = callPackage ../tools/backup/flockit { }; foldingathome = callPackage ../misc/foldingathome { }; @@ -19078,6 +19076,9 @@ with pkgs; martyr = callPackage ../development/libraries/martyr { }; + # previously known as flat-plat + materia-theme = callPackage ../misc/themes/materia-theme { }; + mess = callPackage ../misc/emulators/mess { inherit (pkgs.gnome2) GConf; }; -- cgit 1.4.1