diff options
| author | José Romildo Malaquias <malaquias@gmail.com> | 2019-07-20 23:44:17 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-20 23:44:17 -0300 |
| commit | a835adc10cb813d214a9069361d94a2a3f8eb3a5 (patch) | |
| tree | bb93cb265e06bd687373ba197da471477da2c4bd /pkgs | |
| parent | c55a88fe8f81f7835a7e9c9c5678f0cd14d833f1 (diff) | |
| parent | c8442c7f6a3f9c2bcc198c295dd6038d648a25df (diff) | |
| download | nixlib-a835adc10cb813d214a9069361d94a2a3f8eb3a5.tar nixlib-a835adc10cb813d214a9069361d94a2a3f8eb3a5.tar.gz nixlib-a835adc10cb813d214a9069361d94a2a3f8eb3a5.tar.bz2 nixlib-a835adc10cb813d214a9069361d94a2a3f8eb3a5.tar.lz nixlib-a835adc10cb813d214a9069361d94a2a3f8eb3a5.tar.xz nixlib-a835adc10cb813d214a9069361d94a2a3f8eb3a5.tar.zst nixlib-a835adc10cb813d214a9069361d94a2a3f8eb3a5.zip | |
Merge pull request #64186 from tadfisher/plata-theme
plata-theme: 0.8.3 -> 0.8.7
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/data/themes/plata/default.nix | 15 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 11 insertions, 8 deletions
diff --git a/pkgs/data/themes/plata/default.nix b/pkgs/data/themes/plata/default.nix index df0201af3b86..0d87cd848f84 100644 --- a/pkgs/data/themes/plata/default.nix +++ b/pkgs/data/themes/plata/default.nix @@ -1,14 +1,15 @@ { stdenv, fetchFromGitLab, autoreconfHook, pkgconfig, parallel -, sassc, inkscape, libxml2, gnome2, gdk_pixbuf, librsvg, gtk-engine-murrine +, sassc, inkscape, libxml2, glib, gdk_pixbuf, librsvg, gtk-engine-murrine , cinnamonSupport ? true , gnomeFlashbackSupport ? true , gnomeShellSupport ? true , openboxSupport ? true , xfceSupport ? true +, mateSupport ? true, gtk3, marco , gtkNextSupport ? false , plankSupport ? false , steamSupport ? false -, telegramSupport ? false, zip ? null +, telegramSupport ? false, zip , tweetdeckSupport ? false , selectionColor ? null # Primary color for 'selected-items' (Default: #3F51B5 = Indigo500) , accentColor ? null # Secondary color for notifications and OSDs (Default: #7986CB = Indigo300) @@ -16,17 +17,15 @@ , destructionColor ? null # Tertiary color for 'destructive' buttons (Default: #F44336 = Red500) }: -assert telegramSupport -> zip != null; - stdenv.mkDerivation rec { pname = "plata-theme"; - version = "0.8.3"; + version = "0.8.7"; src = fetchFromGitLab { owner = "tista500"; repo = "plata-theme"; rev = version; - sha256 = "0ibgymdrw91lnng76lb0x55zg6nm9f2vap19wk7qsq3bcw6ny2zi"; + sha256 = "1rn51yj7f7bclvrwwqwid4z9cpap4yd0zw0xs08c36zcjmr28426"; }; preferLocalBuild = true; @@ -38,8 +37,9 @@ stdenv.mkDerivation rec { sassc inkscape libxml2 - gnome2.glib.dev + glib.dev ] + ++ stdenv.lib.optionals mateSupport [ gtk3 marco ] ++ stdenv.lib.optional telegramSupport zip; buildInputs = [ @@ -62,6 +62,7 @@ stdenv.mkDerivation rec { (enableFeature gnomeShellSupport "gnome") (enableFeature openboxSupport "openbox") (enableFeature xfceSupport "xfce") + (enableFeature mateSupport "mate") (enableFeature gtkNextSupport "gtk_next") (enableFeature plankSupport "plank") (enableFeature steamSupport "airforsteam") diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9614079cf20b..d893a5a52d46 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16637,7 +16637,9 @@ in plano-theme = callPackage ../data/themes/plano { }; - plata-theme = callPackage ../data/themes/plata {}; + plata-theme = callPackage ../data/themes/plata { + inherit (mate) marco; + }; poly = callPackage ../data/fonts/poly { }; |