From 32f848003acbd3d901d40dab08daf187c88da27e Mon Sep 17 00:00:00 2001 From: ciferkey Date: Tue, 13 Sep 2022 22:50:03 -0400 Subject: [PATCH 1/2] maintainers: add ciferkey --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 80b7e04371bc..69072e914f47 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2443,6 +2443,12 @@ githubId = 42220376; name = "Charlotte Van Petegem"; }; + ciferkey = { + name = "Matthew Brunelle"; + email = "ciferkey@gmail.com"; + github = "ciferkey"; + githubId = 101422; + }; cigrainger = { name = "Christopher Grainger"; email = "chris@amplified.ai"; From 79a0dd5f4885795cf202cd5f18fd9874e3da1f9a Mon Sep 17 00:00:00 2001 From: ciferkey Date: Tue, 13 Sep 2022 22:59:41 -0400 Subject: [PATCH 2/2] adw-gtk3: init at 3.7 --- pkgs/data/themes/adw-gtk3/default.nix | 45 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 47 insertions(+) create mode 100644 pkgs/data/themes/adw-gtk3/default.nix diff --git a/pkgs/data/themes/adw-gtk3/default.nix b/pkgs/data/themes/adw-gtk3/default.nix new file mode 100644 index 000000000000..f88c11388c79 --- /dev/null +++ b/pkgs/data/themes/adw-gtk3/default.nix @@ -0,0 +1,45 @@ +{ stdenvNoCC +, lib +, fetchFromGitHub +, nix-update-script +, meson +, ninja +, sassc +}: + +stdenvNoCC.mkDerivation rec { + pname = "adw-gtk3"; + version = "3.7"; + + src = fetchFromGitHub { + owner = "lassekongo83"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-hHmNRPUJOXa//aKgAYhGBVX6usRsObWbzcfOa1uwbqM="; + }; + + nativeBuildInputs = [ + meson + ninja + sassc + ]; + + postPatch = '' + chmod +x gtk/src/adw-gtk3-dark/gtk-3.0/install-dark-theme.sh + patchShebangs gtk/src/adw-gtk3-dark/gtk-3.0/install-dark-theme.sh + ''; + + passthru = { + updateScript = nix-update-script { + attrPath = pname; + }; + }; + + meta = with lib; { + description = "The theme from libadwaita ported to GTK-3"; + homepage = "https://github.com/lassekongo83/adw-gtk3"; + license = licenses.lgpl21Only; + platforms = platforms.linux; + maintainers = with maintainers; [ ciferkey ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3528a280d508..1534b7bea010 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25297,6 +25297,8 @@ with pkgs; adwaita-qt = libsForQt5.callPackage ../data/themes/adwaita-qt { }; + adw-gtk3 = callPackage ../data/themes/adw-gtk3 { }; + agave = callPackage ../data/fonts/agave { }; aileron = callPackage ../data/fonts/aileron { };