From 44018d0a56a7a8155b6c89d962498ee844cdeb10 Mon Sep 17 00:00:00 2001
From: Sebastien Bourdeauducq <sb@m-labs.hk>
Date: Wed, 18 Sep 2019 11:57:13 +0800
Subject: [PATCH] nixbld: handle upstream patches properly in overridden
 packages

---
 nixbld-etc-nixos/configuration.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixbld-etc-nixos/configuration.nix b/nixbld-etc-nixos/configuration.nix
index c8849e8..f3f3a64 100644
--- a/nixbld-etc-nixos/configuration.nix
+++ b/nixbld-etc-nixos/configuration.nix
@@ -256,11 +256,11 @@ ACTION=="add", SUBSYSTEM=="tty", \
  
   nixpkgs.config.packageOverrides = super: let self = super.pkgs; in {
     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 ];
     });
     matterbridge = super.matterbridge.overrideAttrs(oa: {
-      patches = [ ./matterbridge-disable-github.patch ];
+      patches = oa.patches or [] ++ [ ./matterbridge-disable-github.patch ];
     });
   };