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

Merge pull request #124818 from NixOS/backport-124200-to-release-21.05

Browse Source
This commit is contained in:
Sandro 2021-06-01 15:41:32 +02:00 committed by GitHub
commit 79b7348294
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix
View File

@ -10,6 +10,8 @@ let
}; };
in in
ourNodePackages."${packageName}".override { ourNodePackages."${packageName}".override {
pname = "matrix-appservice-irc";
nativeBuildInputs = [ makeWrapper nodePackages.node-gyp-build ]; nativeBuildInputs = [ makeWrapper nodePackages.node-gyp-build ];
postInstall = '' postInstall = ''

2
pkgs/servers/matrix-synapse/matrix-appservice-slack/default.nix
View File

@ -13,6 +13,8 @@ let
}; };
in in
nodePackages.package.override { nodePackages.package.override {
pname = "matrix-appservice-slack";
inherit src; inherit src;
nativeBuildInputs = [ pkgs.makeWrapper ]; nativeBuildInputs = [ pkgs.makeWrapper ];

3
pkgs/servers/mx-puppet-discord/default.nix
View File

@ -16,7 +16,10 @@ let
}; };
in myNodePackages.package.override { in myNodePackages.package.override {
pname = "mx-puppet-discord";
inherit src; inherit src;
nativeBuildInputs = [ nodePackages.node-pre-gyp pkg-config ]; nativeBuildInputs = [ nodePackages.node-pre-gyp pkg-config ];
buildInputs = [ libjpeg pixman cairo pango ]; buildInputs = [ libjpeg pixman cairo pango ];