RomanNum3ral
/
quickemu
mirror of https://github.com/quickemu-project/quickemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

refactor: update flake to, mostly, work on macOS

This commit is contained in:
Martin Wimpress 2024-05-31 10:57:18 +01:00 committed by Martin Wimpress
parent d78255b097
commit f4c362eda7
4 changed files with 24 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
devshell.nix
View File

@ -1,5 +1,7 @@
{ {
lib,
mkShell, mkShell,
stdenv,
cdrtools, cdrtools,
curl, curl,
gawk, gawk,
@ -34,7 +36,6 @@ mkShell {
curl curl
gawk gawk
git git
glxinfo
gnugrep gnugrep
gnused gnused
jq jq
@ -46,12 +47,14 @@ mkShell {
qemu qemu
socat socat
spice-gtk spice-gtk
swtpm
unzip unzip
usbutils
util-linux util-linux
xdg-user-dirs
xrandr xrandr
] ++ lib.optionals stdenv.isLinux [
glxinfo
swtpm
usbutils
xdg-user-dirs
zsync zsync
OVMF OVMF
OVMFFull OVMFFull

18
flake.lock
View File

@ -16,16 +16,18 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1714253743, "lastModified": 1716991068,
"narHash": "sha256-mdTQw2XlariysyScCv2tTE45QSU9v/ezLcHJ22f0Nxc=", "narHash": "sha256-Av0UWCCiIGJxsZ6TFc+OiKCJNqwoxMNVYDBChmhjNpo=",
"rev": "58a1abdbae3217ca6b702f03d3b35125d88a2994", "owner": "nixos",
"revCount": 617818, "repo": "nixpkgs",
"type": "tarball", "rev": "25cf937a30bf0801447f6bf544fc7486c6309234",
"url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.617818%2Brev-58a1abdbae3217ca6b702f03d3b35125d88a2994/018f25c6-e917-75c9-967b-ebda3b3dc4ae/source.tar.gz" "type": "github"
}, },
"original": { "original": {
"type": "tarball", "owner": "nixos",
"url": "https://flakehub.com/f/NixOS/nixpkgs/0.1.%2A.tar.gz" "ref": "nixos-23.11",
"repo": "nixpkgs",
"type": "github"
} }
}, },
"root": { "root": {

7
flake.nix
View File

@ -13,10 +13,9 @@
forAllSystems = function: forAllSystems = function:
nixpkgs.lib.genAttrs [ nixpkgs.lib.genAttrs [
"x86_64-linux" "x86_64-linux"
# TODO: Add support for these platforms in quickemu and quickget "aarch64-linux"
# "aarch64-linux" "x86_64-darwin"
# "x86_64-darwin" "aarch64-darwin"
# "aarch64-darwin"
] (system: function nixpkgs.legacyPackages.${system}); ] (system: function nixpkgs.legacyPackages.${system});
in { in {
# Schemas tell Nix about the structure of your flake's outputs # Schemas tell Nix about the structure of your flake's outputs

7
package.nix
View File

@ -33,7 +33,6 @@ let
cdrtools cdrtools
curl curl
gawk gawk
glxinfo
gnugrep gnugrep
gnused gnused
jq jq
@ -45,11 +44,13 @@ let
socat socat
swtpm swtpm
unzip unzip
usbutils
util-linux util-linux
xdg-user-dirs
xrandr xrandr
zsync zsync
] ++ lib.optionals stdenv.isLinux [
glxinfo
usbutils
xdg-user-dirs
]; ];
in in