newell
/
nix-scripts
forked from M-Labs/nix-scripts
1
0
Fork 0
Code Pull Requests Activity

nixbld: handle upstream patches properly in overridden packages

This commit is contained in:
Sebastien Bourdeauducq 2019-09-18 11:57:13 +08:00
parent 8efe227959
commit 44018d0a56
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nixbld-etc-nixos/configuration.nix
View File

@ -256,11 +256,11 @@ ACTION=="add", SUBSYSTEM=="tty", \
nixpkgs.config.packageOverrides = super: let self = super.pkgs; in { nixpkgs.config.packageOverrides = super: let self = super.pkgs; in {
hydra = super.hydra.overrideAttrs(oa: { hydra = super.hydra.overrideAttrs(oa: {
patches = oa.patches ++ [ ./hydra-conda.patch ./hydra-retry.patch ]; patches = oa.patches or [] ++ [ ./hydra-conda.patch ./hydra-retry.patch ];
hydraPath = oa.hydraPath + ":" + super.lib.makeBinPath [ super.jq ]; hydraPath = oa.hydraPath + ":" + super.lib.makeBinPath [ super.jq ];
}); });
matterbridge = super.matterbridge.overrideAttrs(oa: { matterbridge = super.matterbridge.overrideAttrs(oa: {
patches = [ ./matterbridge-disable-github.patch ]; patches = oa.patches or [] ++ [ ./matterbridge-disable-github.patch ];
}); });
}; };