nix: qmk/vial: fix sandboxed builds

rgoulter · Jun 10, 2024 · 02bb16f · 02bb16f
1 parent 095876b
commit 02bb16f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/nix/pkgs/qmk/compile.nix b/nix/pkgs/qmk/compile.nix
@@ -26,12 +26,15 @@ stdenv.mkDerivation rec {
 
   patchPhase = ''
     cp -r ${extra_files}/* .
+    patchShebangs util/uf2conv.py
   '';
 
+  buildInputs = [qmk];
+
   buildPhase = let
     envArg = lib.strings.concatMapStrings (e: " --env " + e) env;
   in ''
-    ${qmk}/bin/qmk compile --keyboard ${keyboard} --keymap ${keymap} ${envArg}
+    qmk compile --keyboard ${keyboard} --keymap ${keymap} ${envArg}
   '';
 
   installPhase = ''

diff --git a/nix/pkgs/qmk/vial.nix b/nix/pkgs/qmk/vial.nix
@@ -34,12 +34,15 @@ stdenv.mkDerivation rec {
     for extra in ${lib.strings.concatStringsSep " " extra_files}; do
       ${rsync}/bin/rsync --recursive $extra/ .
     done
+    patchShebangs util/uf2conv.py
   '';
 
+  buildInputs = [qmk];
+
   buildPhase = let
     envArg = lib.strings.concatMapStrings (e: " --env " + e) env;
   in ''
-    ${qmk}/bin/qmk compile --keyboard ${keyboard} --keymap ${keymap} ${envArg}
+    qmk compile --keyboard ${keyboard} --keymap ${keymap} ${envArg}
   '';
 
   installPhase = ''