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

View File

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

View File

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

View File

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

View File

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