From 066412597a0c49ce0a77f47a9352420a09c80d59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Mon, 21 Sep 2020 21:15:16 -0300 Subject: [PATCH 1/2] materia-theme: format with nix-format --- pkgs/data/themes/materia-theme/default.nix | 27 ++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/pkgs/data/themes/materia-theme/default.nix b/pkgs/data/themes/materia-theme/default.nix index a93c242d2daf..6e658330e59a 100644 --- a/pkgs/data/themes/materia-theme/default.nix +++ b/pkgs/data/themes/materia-theme/default.nix @@ -1,4 +1,13 @@ -{ stdenv, fetchFromGitHub, gnome3, glib, libxml2, gtk-engine-murrine, gdk-pixbuf, librsvg, bc }: +{ stdenv +, fetchFromGitHub +, gnome3 +, glib +, libxml2 +, gtk-engine-murrine +, gdk-pixbuf +, librsvg +, bc +}: stdenv.mkDerivation rec { pname = "materia-theme"; @@ -11,11 +20,21 @@ stdenv.mkDerivation rec { sha256 = "07vbql1y9jfd0m34lw1674cfr6217dzg3irk0450kny8sjrrj6dx"; }; - nativeBuildInputs = [ glib libxml2 bc ]; + nativeBuildInputs = [ + glib + libxml2 + bc + ]; - buildInputs = [ gnome3.gnome-themes-extra gdk-pixbuf librsvg ]; + buildInputs = [ + gnome3.gnome-themes-extra + gdk-pixbuf + librsvg + ]; - propagatedUserEnvPkgs = [ gtk-engine-murrine ]; + propagatedUserEnvPkgs = [ + gtk-engine-murrine + ]; dontBuild = true; From e388dd8542e29b623755103c2e2e36268ce519f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Mon, 21 Sep 2020 21:58:35 -0300 Subject: [PATCH 2/2] materia-theme: 20190912 -> 20200916 --- pkgs/data/themes/materia-theme/default.nix | 29 +++++++++++----------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/pkgs/data/themes/materia-theme/default.nix b/pkgs/data/themes/materia-theme/default.nix index 6e658330e59a..b5c13960be27 100644 --- a/pkgs/data/themes/materia-theme/default.nix +++ b/pkgs/data/themes/materia-theme/default.nix @@ -1,29 +1,29 @@ { stdenv , fetchFromGitHub +, meson +, ninja +, sassc , gnome3 -, glib -, libxml2 , gtk-engine-murrine , gdk-pixbuf , librsvg -, bc }: stdenv.mkDerivation rec { pname = "materia-theme"; - version = "20190912"; + version = "20200916"; src = fetchFromGitHub { owner = "nana-4"; repo = pname; rev = "v${version}"; - sha256 = "07vbql1y9jfd0m34lw1674cfr6217dzg3irk0450kny8sjrrj6dx"; + sha256 = "0qaxxafsn5zd2ysgr0jyv5j73360mfdmxyd55askswlsfphssn74"; }; nativeBuildInputs = [ - glib - libxml2 - bc + meson + ninja + sassc ]; buildInputs = [ @@ -38,19 +38,18 @@ stdenv.mkDerivation rec { dontBuild = true; - installPhase = '' - patchShebangs install.sh - sed -i install.sh \ - -e "s|if .*which gnome-shell.*;|if true;|" \ - -e "s|CURRENT_GS_VERSION=.*$|CURRENT_GS_VERSION=${stdenv.lib.versions.majorMinor gnome3.gnome-shell.version}|" - ./install.sh --dest $out/share/themes + mesonFlags = [ + "-Dgnome_shell_version=${stdenv.lib.versions.majorMinor gnome3.gnome-shell.version}" + ]; + + postInstall = '' rm $out/share/themes/*/COPYING ''; meta = with stdenv.lib; { description = "Material Design theme for GNOME/GTK based desktop environments"; homepage = "https://github.com/nana-4/materia-theme"; - license = licenses.gpl2; + license = licenses.gpl2Only; platforms = platforms.all; maintainers = [ maintainers.mounium ]; };