From db49bd909e96befff25da86306672dc5ed969f5a Mon Sep 17 00:00:00 2001 From: Elyhaka <57923898+Elyhaka@users.noreply.github.com> Date: Wed, 11 Dec 2019 16:33:09 +0100 Subject: [PATCH 1/2] maintainers: add elyhaka --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 14c49a54826..4cfa1333f54 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2081,6 +2081,12 @@ githubId = 1365692; name = "Will Fancher"; }; + elyhaka = { + email = "elyhaka@protonmail.com"; + github = "Elyhaka"; + githubId = 57923898; + name = "Elyhaka"; + }; emmanuelrosa = { email = "emmanuel_rosa@aol.com"; github = "emmanuelrosa"; From 79850f5df83622a3e5f60a34e7178a52e4cae539 Mon Sep 17 00:00:00 2001 From: Elyhaka <57923898+Elyhaka@users.noreply.github.com> Date: Wed, 11 Dec 2019 16:34:41 +0100 Subject: [PATCH 2/2] pop-gtk-theme: init at 2019-12-17 --- pkgs/data/themes/pop-gtk/default.nix | 62 ++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 64 insertions(+) create mode 100644 pkgs/data/themes/pop-gtk/default.nix diff --git a/pkgs/data/themes/pop-gtk/default.nix b/pkgs/data/themes/pop-gtk/default.nix new file mode 100644 index 00000000000..151fadddc16 --- /dev/null +++ b/pkgs/data/themes/pop-gtk/default.nix @@ -0,0 +1,62 @@ +{ stdenv +, fetchFromGitHub +, meson +, ninja +, sassc +, gtk3 +, inkscape +, optipng +, gtk-engine-murrine +, gdk-pixbuf +, librsvg +}: + +stdenv.mkDerivation rec { + pname = "pop-gtk-theme"; + version = "2019-12-17"; + + src = fetchFromGitHub { + owner = "pop-os"; + repo = "gtk-theme"; + rev = "77601545f049251bce9c63a07f0d9819aa27cb60"; + sha256 = "0bmkcdr1z9m3inrw33zprq2a4jawql4724a84nr89r19xllj2z1s"; + }; + + nativeBuildInputs = [ + meson + ninja + sassc + gtk3 + inkscape + optipng + ]; + + buildInputs = [ + gdk-pixbuf + librsvg + ]; + + propagatedUserEnvPkgs = [ + gtk-engine-murrine + ]; + + postPatch = '' + for file in $(find -name render-\*.sh); do + patchShebangs "$file" + + substituteInPlace "$file" \ + --replace 'INKSCAPE="/usr/bin/inkscape"' \ + 'INKSCAPE="inkscape"' \ + --replace 'OPTIPNG="/usr/bin/optipng"' \ + 'OPTIPNG="optipng"' + done + ''; + + meta = with stdenv.lib; { + description = "System76 Pop GTK+ Theme"; + homepage = "https://github.com/pop-os/gtk-theme"; + license = with licenses; [ gpl3 lgpl21 cc-by-sa-40 ]; + platforms = platforms.linux; + maintainers = with maintainers; [ elyhaka ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2b0483568cb..c1bb467eed9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17538,6 +17538,8 @@ in polytopes_db = callPackage ../data/misc/polytopes_db { }; + pop-gtk-theme = callPackage ../data/themes/pop-gtk { }; + posix_man_pages = callPackage ../data/documentation/man-pages-posix { }; powerline-fonts = callPackage ../data/fonts/powerline-fonts { };