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

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

View File

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

View File

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

View File

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