Merge pull request #35 from serokell/rvem/patched-binaries

Make source patches configurable
serokell · Feb 24, 2020 · 6af8446 · 6af8446
2 parents 991995d + a13b9b2
commit 6af8446
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/default.nix b/default.nix
@@ -1,7 +1,7 @@
 # SPDX-FileCopyrightText: 2019 TQ Tezos <https://tqtezos.com/>
 #
 # SPDX-License-Identifier: MPL-2.0
-{ pkgs ? import <nixpkgs> { }, timestamp ? "19700101" }:
+{ pkgs ? import <nixpkgs> { }, timestamp ? "19700101", patches ? [] }:
 with pkgs;
 
 let
@@ -18,7 +18,7 @@ let
   master = {
     rev = "60b977cd";
     sha256 = "1v9v5z5i3cs9jw48m3xx9w4fqkns37nn464fr7hds7wgmwfmf1sp";
-    patchFile = ./nix/fix-master.patch;
+    patches = [ ./nix/fix-master.patch ] ++ patches;
     inherit protocols;
   };
   static-nix = import ./nix/static.nix;

diff --git a/nix/default.nix b/nix/default.nix
@@ -365,7 +365,7 @@ let
 
         minimumOCamlVersion = "4.07";
 
-        patches = [ branchInfo.patchFile ];
+        patches = branchInfo.patches;
         src = fetchgit {
           url = "https://gitlab.com/tezos/tezos.git/";
           rev = branchInfo.rev;