From c3bad73e27a5bda3f8f8c768cec818c52b0f95e3 Mon Sep 17 00:00:00 2001
From: Wil Taylor <cert@wiltaylor.dev>
Date: Sat, 21 Nov 2020 14:28:49 +1000
Subject: [PATCH 1/2] Added switch

---
 src/nix/bundle.cc | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/nix/bundle.cc b/src/nix/bundle.cc
index 2d0a0b6ea..c59018726 100644
--- a/src/nix/bundle.cc
+++ b/src/nix/bundle.cc
@@ -11,6 +11,7 @@ struct CmdBundle : InstallableCommand
 {
     std::string bundler = "github:matthewbauer/nix-bundle";
     std::optional<Path> outLink;
+    bool skipReferenceCheck = false;
 
     CmdBundle()
     {
@@ -32,6 +33,12 @@ struct CmdBundle : InstallableCommand
             .handler = {&outLink},
             .completer = completePath
         });
+
+        addFlag({
+            .longName = "skip-refcheck",
+            .description = "Skip checking of references in bundle.",
+            .handler = {&skipReferenceCheck, true},
+            });
     }
 
     std::string description() override
@@ -117,7 +124,7 @@ struct CmdBundle : InstallableCommand
         auto outPathS = store->printStorePath(outPath);
 
         auto info = store->queryPathInfo(outPath);
-        if (!info->references.empty())
+        if (!info->references.empty() && !skipReferenceCheck)
             throw Error("'%s' has references; a bundler must not leave any references", outPathS);
 
         if (!outLink)

From 07603890d2867907905ba411cee550390d868936 Mon Sep 17 00:00:00 2001
From: Wil Taylor <cert@wiltaylor.dev>
Date: Mon, 23 Nov 2020 21:19:40 +1000
Subject: [PATCH 2/2] Removed reference check from bundler command

---
 src/nix/bundle.cc | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/src/nix/bundle.cc b/src/nix/bundle.cc
index c59018726..eddd82f40 100644
--- a/src/nix/bundle.cc
+++ b/src/nix/bundle.cc
@@ -11,7 +11,6 @@ struct CmdBundle : InstallableCommand
 {
     std::string bundler = "github:matthewbauer/nix-bundle";
     std::optional<Path> outLink;
-    bool skipReferenceCheck = false;
 
     CmdBundle()
     {
@@ -34,11 +33,6 @@ struct CmdBundle : InstallableCommand
             .completer = completePath
         });
 
-        addFlag({
-            .longName = "skip-refcheck",
-            .description = "Skip checking of references in bundle.",
-            .handler = {&skipReferenceCheck, true},
-            });
     }
 
     std::string description() override
@@ -123,10 +117,6 @@ struct CmdBundle : InstallableCommand
 
         auto outPathS = store->printStorePath(outPath);
 
-        auto info = store->queryPathInfo(outPath);
-        if (!info->references.empty() && !skipReferenceCheck)
-            throw Error("'%s' has references; a bundler must not leave any references", outPathS);
-
         if (!outLink)
             outLink = baseNameOf(app.program);