diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2020-04-11 12:01:45 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-11 12:01:45 +0200 |
| commit | dd0c85d546c276bf82ad6c2d96ea6ae67052f1e1 (patch) | |
| tree | e5cd7c46e9b6a3d8918d4511e2a7a272dce6487b | |
| parent | 9cddcac99507b1aff2c682a45a5084b931e34d96 (diff) | |
| parent | a9df1dcd91e53ed4ca6cd67e2dbede3c238841b1 (diff) | |
| download | nixpkgs-dd0c85d546c276bf82ad6c2d96ea6ae67052f1e1.tar nixpkgs-dd0c85d546c276bf82ad6c2d96ea6ae67052f1e1.tar.gz nixpkgs-dd0c85d546c276bf82ad6c2d96ea6ae67052f1e1.tar.bz2 nixpkgs-dd0c85d546c276bf82ad6c2d96ea6ae67052f1e1.tar.lz nixpkgs-dd0c85d546c276bf82ad6c2d96ea6ae67052f1e1.tar.xz nixpkgs-dd0c85d546c276bf82ad6c2d96ea6ae67052f1e1.tar.zst nixpkgs-dd0c85d546c276bf82ad6c2d96ea6ae67052f1e1.zip | |
Merge pull request #84969 from kisik21/mako-svg-icons
mako: wrap with wrapGAppsHook
| -rw-r--r-- | maintainers/maintainer-list.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/misc/mako/default.nix | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index a518c738fb6..1a4f2b94f5d 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -7873,8 +7873,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 = { diff --git a/pkgs/applications/misc/mako/default.nix b/pkgs/applications/misc/mako/default.nix index 89ae647042d..e1b14acb46f 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" ]; |