From c6eabc00331d238841306951a40a4c7b02573db3 Mon Sep 17 00:00:00 2001 From: Vika Date: Sat, 11 Apr 2020 06:00:18 +0300 Subject: [PATCH 1/2] mako: wrap with wrapGAppsHook mako wasn't finding the librsvg library and its gdk-pixbuf loader, the SVG icon support was broken for a long time. --- pkgs/applications/misc/mako/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/mako/default.nix b/pkgs/applications/misc/mako/default.nix index f86effe989f..400dd759925 100644 --- a/pkgs/applications/misc/mako/default.nix +++ b/pkgs/applications/misc/mako/default.nix @@ -1,6 +1,7 @@ { stdenv, fetchFromGitHub, meson, ninja, pkgconfig, scdoc , systemd, pango, cairo, gdk-pixbuf -, wayland, wayland-protocols }: +, wayland, wayland-protocols +, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "mako"; @@ -13,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "0hwvibpnrximb628w9dsfjpi30b5jy7nfkm4d94z5vhp78p43vxh"; }; - nativeBuildInputs = [ meson ninja pkgconfig scdoc wayland-protocols ]; + nativeBuildInputs = [ meson ninja pkgconfig scdoc wayland-protocols wrapGAppsHook ]; buildInputs = [ systemd pango cairo gdk-pixbuf wayland ]; mesonFlags = [ "-Dzsh-completions=true" ]; From a9df1dcd91e53ed4ca6cd67e2dbede3c238841b1 Mon Sep 17 00:00:00 2001 From: Vika Date: Sat, 11 Apr 2020 06:08:00 +0300 Subject: [PATCH 2/2] maintainer-list.nix: updated my GPG key. New fp: B3C0 DA1A C18B 82E8 CA8B B1D1 4F62 CD07 CE64 796A --- maintainers/maintainer-list.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 3551ef849ed..29218b5badd 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -7855,8 +7855,8 @@ githubId = 7953163; name = "Vika Shleina"; keys = [{ - longkeyid = "rsa4096/0x5402B9B5497BACDB"; - fingerprint = "A03C D09C 36CF D9F6 1ADF AF11 5402 B9B5 497B ACDB"; + longkeyid = "rsa2048/0x4F62CD07CE64796A"; + fingerprint = "B3C0 DA1A C18B 82E8 CA8B B1D1 4F62 CD07 CE64 796A"; }]; }; vinymeuh = {