fix: patch samba detection in Nix flake

quickemu-project · Jul 2, 2024 · 66dfa64 · 66dfa64
1 parent 13f98e3
commit 66dfa64
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/devshell.nix b/devshell.nix
@@ -15,7 +15,8 @@ mkShell {
     pciutils
     procps
     python3
-    qemu
+    qemu_full
+    samba
     socat
     spice-gtk
     swtpm
@@ -43,8 +44,8 @@ mkShell {
       -e '/OVMF_CODE_4M.secboot.fd/s|ovmfs=(|ovmfs=("${pkgs.OVMFFull.firmware}","${pkgs.OVMFFull.variables}" |' \
       -e '/OVMF_CODE_4M.fd/s|ovmfs=(|ovmfs=("${pkgs.OVMF.firmware}","${pkgs.OVMF.variables}" |' \
       -e '/cp "''${VARS_IN}" "''${VARS_OUT}"/a chmod +w "''${VARS_OUT}"' \
-      -e 's/Icon=.*qemu.svg/Icon=qemu/' \
+      -e 's,\$(command -v smbd),${pkgs.samba}/bin/smbd,' \
       quickemu > $PWD/.direnv/bin/quickemu
-      chmod +x $PWD/.direnv/bin/quickemu
+    chmod +x $PWD/.direnv/bin/quickemu
   '';
 }
diff --git a/package.nix b/package.nix
@@ -74,7 +74,7 @@ stdenv.mkDerivation rec {
       -e '/OVMF_CODE_4M.secboot.fd/s|ovmfs=(|ovmfs=("${OVMFFull.firmware}","${OVMFFull.variables}" |' \
       -e '/OVMF_CODE_4M.fd/s|ovmfs=(|ovmfs=("${OVMF.firmware}","${OVMF.variables}" |' \
       -e '/cp "''${VARS_IN}" "''${VARS_OUT}"/a chmod +w "''${VARS_OUT}"' \
-      -e 's/Icon=.*qemu.svg/Icon=qemu/' \
+      -e 's,\$(command -v smbd),${samba}/bin/smbd,' \
       quickemu
   '';