diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2021-06-01 15:41:32 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-01 15:41:32 +0200 |
| commit | 79b734829435eacc23da1f3267d529544e7a4a71 (patch) | |
| tree | b1a2d3700fca2b81cf7cd5ab40f5ad75f42d57fd | |
| parent | haskellPackages.webify: unbreak, jailbreak, as patches are not upstreamable atm (diff) | |
| parent | mx-puppet-discord: set pname (diff) | |
| download | nixpkgs-79b734829435eacc23da1f3267d529544e7a4a71.tar.gz | |
Merge pull request #124818 from NixOS/backport-124200-to-release-21.05
3 files changed, 7 insertions, 0 deletions
diff --git a/pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix b/pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix index 808e81370bbd..ab92c29ee3dc 100644 --- a/pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix +++ b/pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix @@ -10,6 +10,8 @@ let }; in ourNodePackages."${packageName}".override { + pname = "matrix-appservice-irc"; + nativeBuildInputs = [ makeWrapper nodePackages.node-gyp-build ]; postInstall = '' diff --git a/pkgs/servers/matrix-synapse/matrix-appservice-slack/default.nix b/pkgs/servers/matrix-synapse/matrix-appservice-slack/default.nix index 9d21065dc02a..596739a45d73 100644 --- a/pkgs/servers/matrix-synapse/matrix-appservice-slack/default.nix +++ b/pkgs/servers/matrix-synapse/matrix-appservice-slack/default.nix @@ -13,6 +13,8 @@ let }; in nodePackages.package.override { + pname = "matrix-appservice-slack"; + inherit src; nativeBuildInputs = [ pkgs.makeWrapper ]; diff --git a/pkgs/servers/mx-puppet-discord/default.nix b/pkgs/servers/mx-puppet-discord/default.nix index b3b72c2c5f2b..d2606148768d 100644 --- a/pkgs/servers/mx-puppet-discord/default.nix +++ b/pkgs/servers/mx-puppet-discord/default.nix @@ -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 ]; |