From 5f1c96b12f12d6cbd84b14a0a8f5276f1aa9f3b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Sun, 24 May 2020 13:56:16 -0300 Subject: [PATCH 1/2] plano-theme: format with nixpkgs-fmt --- pkgs/data/themes/plano/default.nix | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/pkgs/data/themes/plano/default.nix b/pkgs/data/themes/plano/default.nix index ff1825f63410..6c0d3a13529c 100644 --- a/pkgs/data/themes/plano/default.nix +++ b/pkgs/data/themes/plano/default.nix @@ -1,4 +1,10 @@ -{ stdenv, fetchFromGitHub, gdk-pixbuf, gtk_engines, gtk-engine-murrine, librsvg }: +{ stdenv +, fetchFromGitHub +, gdk-pixbuf +, gtk_engines +, gtk-engine-murrine +, librsvg +}: stdenv.mkDerivation rec { pname = "plano-theme"; @@ -11,9 +17,15 @@ stdenv.mkDerivation rec { sha256 = "0spbyvzb47vyfhcn3gr0z1gdb5xrprynm6442y1z32znai2bgpnd"; }; - buildInputs = [ gdk-pixbuf gtk_engines librsvg ]; + buildInputs = [ + gdk-pixbuf + gtk_engines + librsvg + ]; - propagatedUserEnvPkgs = [ gtk-engine-murrine ]; + propagatedUserEnvPkgs = [ + gtk-engine-murrine + ]; dontBuild = true; From 76d707ff217542415b388aad42eab2acdc458776 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Sun, 24 May 2020 14:04:07 -0300 Subject: [PATCH 2/2] plano-theme: 3.34-2 -> 3.36-1 - Update to version 3.36-1 - Build with meson --- pkgs/data/themes/plano/default.nix | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/pkgs/data/themes/plano/default.nix b/pkgs/data/themes/plano/default.nix index 6c0d3a13529c..7ac245b920f2 100644 --- a/pkgs/data/themes/plano/default.nix +++ b/pkgs/data/themes/plano/default.nix @@ -1,22 +1,31 @@ { stdenv , fetchFromGitHub +, meson +, ninja , gdk-pixbuf , gtk_engines , gtk-engine-murrine , librsvg +, sassc }: stdenv.mkDerivation rec { pname = "plano-theme"; - version = "3.34-2"; + version = "3.36-1"; src = fetchFromGitHub { owner = "lassekongo83"; repo = pname; rev = "v${version}"; - sha256 = "0spbyvzb47vyfhcn3gr0z1gdb5xrprynm6442y1z32znai2bgpnd"; + sha256 = "1rngn5a7hwjqpznbg5kvgs237d2q1anywg37k1cz153ipa96snrv"; }; + nativeBuildInputs = [ + meson + ninja + sassc + ]; + buildInputs = [ gdk-pixbuf gtk_engines @@ -27,14 +36,6 @@ stdenv.mkDerivation rec { gtk-engine-murrine ]; - dontBuild = true; - - installPhase = '' - install -dm 755 $out/share/themes/Plano - cp -a * $out/share/themes/Plano/ - rm $out/share/themes/Plano/{LICENSE,README.md} - ''; - meta = with stdenv.lib; { description = "Flat theme for GNOME and Xfce"; homepage = "https://github.com/lassekongo83/plano-theme";