From 66dfa6451af8249659076adaf784a8850393bc65 Mon Sep 17 00:00:00 2001 From: Martin Wimpress Date: Tue, 2 Jul 2024 13:09:35 +0100 Subject: [PATCH] fix: patch samba detection in Nix flake --- devshell.nix | 7 ++++--- package.nix | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/devshell.nix b/devshell.nix index 3dd7834..5b42afb 100644 --- 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 index e518f35..1ea8095 100644 --- 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 '';