From 76b39037c952f527424f52572a24f8dbbb3c0cda Mon Sep 17 00:00:00 2001 From: Vincent Cui Date: Fri, 14 May 2021 20:20:51 +0200 Subject: [PATCH 1/2] maintainers: add hoppla20 --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index e229e6a0818..2ecc284a90b 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4109,6 +4109,12 @@ githubId = 362833; name = "Hongchang Wu"; }; + hoppla20 = { + email = "privat@vincentcui.de"; + github = "hoppla20"; + githubId = 25618740; + name = "Vincent Cui"; + }; hoverbear = { email = "operator+nix@hoverbear.org"; github = "hoverbear"; From 37c63402f29f78e67e54ac5dcae91c60253fbad9 Mon Sep 17 00:00:00 2001 From: Vincent Cui Date: Fri, 14 May 2021 20:21:10 +0200 Subject: [PATCH 2/2] yaru-remix-theme: init at 40 --- pkgs/data/themes/yaru-remix/default.nix | 28 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/data/themes/yaru-remix/default.nix diff --git a/pkgs/data/themes/yaru-remix/default.nix b/pkgs/data/themes/yaru-remix/default.nix new file mode 100644 index 00000000000..87056583b55 --- /dev/null +++ b/pkgs/data/themes/yaru-remix/default.nix @@ -0,0 +1,28 @@ +{ lib, stdenv, fetchFromGitHub, meson, sassc, pkg-config, glib, ninja, python3, gtk3, gnome }: + +stdenv.mkDerivation rec { + pname = "yaru-remix"; + version = "40"; + + src = fetchFromGitHub { + owner = "Muqtxdir"; + repo = pname; + rev = "v${version}"; + sha256 = "0xilhw5gbxsyy80ixxgj0nw6w782lz9dsinhi24026li1xny804c"; + }; + + nativeBuildInputs = [ meson sassc pkg-config glib ninja python3 ]; + buildInputs = [ gtk3 gnome.gnome-themes-extra ]; + + dontDropIconThemeCache = true; + + postPatch = "patchShebangs ."; + + meta = with lib; { + description = "Fork of the Yaru GTK theme"; + homepage = "https://github.com/Muqtxdir/yaru-remix"; + license = with licenses; [ cc-by-sa-40 gpl3Plus lgpl21Only lgpl3Only ]; + platforms = platforms.linux; + maintainers = with maintainers; [ hoppla20 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 34540ed59b1..88b064171da 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22354,6 +22354,8 @@ in yaru-theme = callPackage ../data/themes/yaru {}; + yaru-remix-theme = callPackage ../data/themes/yaru-remix {}; + zafiro-icons = callPackage ../data/icons/zafiro-icons { inherit (plasma5Packages) breeze-icons; };