public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #84969 from kisik21/mako-svg-icons 

mako: wrap with wrapGAppsHook
This commit is contained in:
Jan Tojnar 2020-04-11 12:01:45 +02:00 committed by GitHub
parent 9cddcac995 a9df1dcd91
commit dd0c85d546
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
maintainers/maintainer-list.nix
View File

@ -7873,8 +7873,8 @@
githubId = 7953163; githubId = 7953163;
name = "Vika Shleina"; name = "Vika Shleina";
keys = [{ keys = [{
longkeyid = "rsa4096/0x5402B9B5497BACDB"; longkeyid = "rsa2048/0x4F62CD07CE64796A";
fingerprint = "A03C D09C 36CF D9F6 1ADF AF11 5402 B9B5 497B ACDB"; fingerprint = "B3C0 DA1A C18B 82E8 CA8B B1D1 4F62 CD07 CE64 796A";
}]; }];
}; };
vinymeuh = { vinymeuh = {

5
pkgs/applications/misc/mako/default.nix
View File

@ -1,6 +1,7 @@
{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, scdoc { stdenv, fetchFromGitHub, meson, ninja, pkgconfig, scdoc
, systemd, pango, cairo, gdk-pixbuf , systemd, pango, cairo, gdk-pixbuf
, wayland, wayland-protocols }: , wayland, wayland-protocols
, wrapGAppsHook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "mako"; pname = "mako";
@ -13,7 +14,7 @@ stdenv.mkDerivation rec {
sha256 = "0hwvibpnrximb628w9dsfjpi30b5jy7nfkm4d94z5vhp78p43vxh"; sha256 = "0hwvibpnrximb628w9dsfjpi30b5jy7nfkm4d94z5vhp78p43vxh";
}; };
nativeBuildInputs = [ meson ninja pkgconfig scdoc wayland-protocols ]; nativeBuildInputs = [ meson ninja pkgconfig scdoc wayland-protocols wrapGAppsHook ];
buildInputs = [ systemd pango cairo gdk-pixbuf wayland ]; buildInputs = [ systemd pango cairo gdk-pixbuf wayland ];
mesonFlags = [ "-Dzsh-completions=true" ]; mesonFlags = [ "-Dzsh-completions=true" ];