From 170c5f2b6dbe23aa33eb344dd299863f30ae126f Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Sat, 8 Jan 2022 22:34:11 +0100
Subject: ...

---
 flake.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'flake.nix')

diff --git a/flake.nix b/flake.nix
index 237d7e9..33f1e76 100644
--- a/flake.nix
+++ b/flake.nix
@@ -101,10 +101,10 @@
         phases = [ "unpackPhase" "patchPhase" "buildPhase" "installPhase" ];
         patchPhase = let
           feedsConf = pkgs.writeText "feeds.conf" ''
-            src-link packages ${inputs.openwrt-packages}
-            src-link luci ${inputs.openwrt-luci}
-            src-link routing ${inputs.openwrt-routing}
-            src-link telephony ${inputs.openwrt-telephony}
+            src-cpy packages ${inputs.openwrt-packages}
+            src-cpy luci ${inputs.openwrt-luci}
+            src-cpy routing ${inputs.openwrt-routing}
+            src-cpy telephony ${inputs.openwrt-telephony}
           '';
         in ''
           rm feeds.conf.default
@@ -157,7 +157,7 @@
               ${pkgs.rsync}/bin/rsync --chmod=u+wX -rlptD --exclude /tmp --exclude /build_dir --exclude /bin --exclude /staging_dir ${openwrtWithPackages}/. ${./files}/. ./.
 
               patchDir=$(mktemp -d -t patches.XXXXXXXXXX)
-              ${pkgs.rsync}/bin/rsync --chmod=u+wX -rlptD ${./patches}/. "$patchDir/."
+              ${pkgs.rsync}/bin/rsync --chmod=u+wX -rlptD ${./patches}/. "''${patchDir}/."
 
               while IFS= read -r -d $'\0' sopsFile; do
                 ${pkgs.sops}/bin/sops --output="''${sopsFile%.sops}" --decrypt "''${sopsFile}"
-- 
cgit v1.2.3