Skip to content

Commit 76386ab

Browse files
committed
refactor: update flake to, mostly, work on macOS
1 parent 1b0dfed commit 76386ab

File tree

4 files changed

+24
-19
lines changed

4 files changed

+24
-19
lines changed

devshell.nix

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
{
2+
lib,
23
mkShell,
4+
stdenv,
35
cdrtools,
46
curl,
57
gawk,
@@ -34,7 +36,6 @@ mkShell {
3436
curl
3537
gawk
3638
git
37-
glxinfo
3839
gnugrep
3940
gnused
4041
jq
@@ -46,12 +47,14 @@ mkShell {
4647
qemu
4748
socat
4849
spice-gtk
49-
swtpm
5050
unzip
51-
usbutils
5251
util-linux
53-
xdg-user-dirs
5452
xrandr
53+
] ++ lib.optionals stdenv.isLinux [
54+
glxinfo
55+
swtpm
56+
usbutils
57+
xdg-user-dirs
5558
zsync
5659
OVMF
5760
OVMFFull

flake.lock

Lines changed: 10 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,9 @@
1313
forAllSystems = function:
1414
nixpkgs.lib.genAttrs [
1515
"x86_64-linux"
16-
# TODO: Add support for these platforms in quickemu and quickget
17-
# "aarch64-linux"
18-
# "x86_64-darwin"
19-
# "aarch64-darwin"
16+
"aarch64-linux"
17+
"x86_64-darwin"
18+
"aarch64-darwin"
2019
] (system: function nixpkgs.legacyPackages.${system});
2120
in {
2221
# Schemas tell Nix about the structure of your flake's outputs

package.nix

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ let
3333
cdrtools
3434
curl
3535
gawk
36-
glxinfo
3736
gnugrep
3837
gnused
3938
jq
@@ -45,11 +44,13 @@ let
4544
socat
4645
swtpm
4746
unzip
48-
usbutils
4947
util-linux
50-
xdg-user-dirs
5148
xrandr
5249
zsync
50+
] ++ lib.optionals stdenv.isLinux [
51+
glxinfo
52+
usbutils
53+
xdg-user-dirs
5354
];
5455
in
5556

0 commit comments

Comments
 (0)