Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,11 @@ Architecture: all
Depends:
coreutils,
curl,
gdisk,
genisoimage,
jq,
mesa-utils,
mtools,
pciutils,
procps,
python3-minimal,
Expand Down
4 changes: 2 additions & 2 deletions devshell.nix
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ mkShell {
xorg.xrandr
zsync
]
++ lib.optionals stdenv.isLinux [
++ lib.optionals stdenv.hostPlatform.isLinux [
mesa-demos
usbutils
xdg-user-dirs
Expand All @@ -57,7 +57,7 @@ mkShell {
-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}" |' \
''
}${lib.optionalString stdenv.isDarwin ''
}${lib.optionalString stdenv.hostPlatform.isDarwin ''
-e 's|ovmfs=("[$][{]SHARE_PATH}/OVMF/OVMF_CODE_4M.secboot.fd"|ovmfs=("${pkgs.qemu_full}/share/qemu/edk2-x86_64-secure-code.fd","${pkgs.qemu_full}/share/qemu/edk2-i386-vars.fd" "''${SHARE_PATH}/OVMF/OVMF_CODE_4M.secboot.fd"|' \
-e 's|ovmfs=("[$][{]SHARE_PATH}/OVMF/OVMF_CODE_4M.fd"|ovmfs=("${pkgs.qemu_full}/share/qemu/edk2-x86_64-code.fd","${pkgs.qemu_full}/share/qemu/edk2-i386-vars.fd" "''${SHARE_PATH}/OVMF/OVMF_CODE_4M.fd"|' \
-e 's|ovmfs=("/usr/share/AAVMF/AAVMF_CODE.fd"|ovmfs=("${pkgs.qemu_full}/share/qemu/edk2-aarch64-code.fd","${pkgs.qemu_full}/share/qemu/edk2-arm-vars.fd" "/usr/share/AAVMF/AAVMF_CODE.fd"|' \
Expand Down
6 changes: 3 additions & 3 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
let
# OVMF is only available/needed on Linux
ovmfArgs =
if final.stdenv.isLinux then
if final.stdenv.hostPlatform.isLinux then
{ }
else
{
Expand All @@ -60,7 +60,7 @@
let
# OVMF is only available/needed on Linux
ovmfArgs =
if pkgs.stdenv.isLinux then
if pkgs.stdenv.hostPlatform.isLinux then
{ }
else
{
Expand All @@ -80,7 +80,7 @@
let
# OVMF is only available/needed on Linux
ovmfArgs =
if pkgs.stdenv.isLinux then
if pkgs.stdenv.hostPlatform.isLinux then
{ }
else
{
Expand Down
11 changes: 6 additions & 5 deletions package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
zsync,
OVMF ? null,
OVMFFull ? null,
quickemu,
}:
let
runtimePaths = [
Expand All @@ -54,7 +53,7 @@ let
xrandr
zsync
]
++ lib.optionals stdenv.isLinux [
++ lib.optionals stdenv.hostPlatform.isLinux [
mesa-demos
OVMF
OVMFFull
Expand All @@ -67,7 +66,7 @@ let
.*
'' (builtins.readFile ./quickemu);
in
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "quickemu";
version = builtins.concatStringsSep "" versionMatches;
src = lib.cleanSource ./.;
Expand All @@ -81,6 +80,7 @@ stdenv.mkDerivation rec {
''
} \
-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
'';
Expand All @@ -107,16 +107,17 @@ stdenv.mkDerivation rec {
runHook postInstall
'';

passthru.tests = testers.testVersion { package = quickemu; };
passthru.tests = testers.testVersion { package = finalAttrs.finalPackage; };

meta = {
description = "Quickly create and run optimised Windows, macOS and Linux virtual machines";
homepage = "https://github.com/quickemu-project/quickemu";
changelog = "https://github.com/quickemu-project/quickemu/releases/tag/${finalAttrs.version}";
mainProgram = "quickemu";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [
fedx-sudo
flexiondotorg
];
};
}
})
Loading