File tree Expand file tree Collapse file tree 4 files changed +13
-10
lines changed
Expand file tree Collapse file tree 4 files changed +13
-10
lines changed Original file line number Diff line number Diff line change @@ -15,9 +15,11 @@ Architecture: all
1515Depends:
1616 coreutils,
1717 curl,
18+ gdisk,
1819 genisoimage,
1920 jq,
2021 mesa-utils,
22+ mtools,
2123 pciutils,
2224 procps,
2325 python3-minimal,
Original file line number Diff line number Diff line change @@ -32,7 +32,7 @@ mkShell {
3232 xorg . xrandr
3333 zsync
3434 ]
35- ++ lib . optionals stdenv . isLinux [
35+ ++ lib . optionals stdenv . hostPlatform . isLinux [
3636 mesa-demos
3737 usbutils
3838 xdg-user-dirs
@@ -57,7 +57,7 @@ mkShell {
5757 -e '/OVMF_CODE_4M.secboot.fd/s|ovmfs=(|ovmfs=("${ OVMFFull . firmware } ","${ OVMFFull . variables } " |' \
5858 -e '/OVMF_CODE_4M.fd/s|ovmfs=(|ovmfs=("${ OVMF . firmware } ","${ OVMF . variables } " |' \
5959 ''
60- } ${ lib . optionalString stdenv . isDarwin ''
60+ } ${ lib . optionalString stdenv . hostPlatform . isDarwin ''
6161 -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"|' \
6262 -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"|' \
6363 -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"|' \
Original file line number Diff line number Diff line change 4141 let
4242 # OVMF is only available/needed on Linux
4343 ovmfArgs =
44- if final . stdenv . isLinux then
44+ if final . stdenv . hostPlatform . isLinux then
4545 { }
4646 else
4747 {
6060 let
6161 # OVMF is only available/needed on Linux
6262 ovmfArgs =
63- if pkgs . stdenv . isLinux then
63+ if pkgs . stdenv . hostPlatform . isLinux then
6464 { }
6565 else
6666 {
8080 let
8181 # OVMF is only available/needed on Linux
8282 ovmfArgs =
83- if pkgs . stdenv . isLinux then
83+ if pkgs . stdenv . hostPlatform . isLinux then
8484 { }
8585 else
8686 {
Original file line number Diff line number Diff line change 3030 zsync ,
3131 OVMF ? null ,
3232 OVMFFull ? null ,
33- quickemu ,
3433} :
3534let
3635 runtimePaths = [
5453 xrandr
5554 zsync
5655 ]
57- ++ lib . optionals stdenv . isLinux [
56+ ++ lib . optionals stdenv . hostPlatform . isLinux [
5857 mesa-demos
5958 OVMF
6059 OVMFFull
6766 .*
6867 '' ( builtins . readFile ./quickemu ) ;
6968in
70- stdenv . mkDerivation rec {
69+ stdenv . mkDerivation ( finalAttrs : {
7170 pname = "quickemu" ;
7271 version = builtins . concatStringsSep "" versionMatches ;
7372 src = lib . cleanSource ./. ;
@@ -81,6 +80,7 @@ stdenv.mkDerivation rec {
8180 ''
8281 } \
8382 -e '/cp "'' ${VARS_IN}" "'' ${VARS_OUT}"/a chmod +w "'' ${VARS_OUT}"' \
83+ -e 's/Icon=.*qemu.svg/Icon=qemu/' \
8484 -e 's,\$(command -v smbd),${ samba } /bin/smbd,' \
8585 quickemu
8686 '' ;
@@ -107,16 +107,17 @@ stdenv.mkDerivation rec {
107107 runHook postInstall
108108 '' ;
109109
110- passthru . tests = testers . testVersion { package = quickemu ; } ;
110+ passthru . tests = testers . testVersion { package = finalAttrs . finalPackage ; } ;
111111
112112 meta = {
113113 description = "Quickly create and run optimised Windows, macOS and Linux virtual machines" ;
114114 homepage = "https://github.com/quickemu-project/quickemu" ;
115+ changelog = "https://github.com/quickemu-project/quickemu/releases/tag/${ finalAttrs . version } " ;
115116 mainProgram = "quickemu" ;
116117 license = lib . licenses . mit ;
117118 maintainers = with lib . maintainers ; [
118119 fedx-sudo
119120 flexiondotorg
120121 ] ;
121122 } ;
122- }
123+ } )
You can’t perform that action at this time.
0 commit comments