fix macos ci

alba4k · Dec 30, 2024 · ca9a19c · ca9a19c
1 parent fbbed48
commit ca9a19c
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/Makefile b/Makefile
@@ -1,4 +1,4 @@
-.PHONY: compile
+.PHONY: all compile clean run debug deb install uninstall
 
 OS := $(shell uname -o 2> /dev/null)
 KERNEL := $(shell uname -s 2> /dev/null)
@@ -9,8 +9,6 @@ CONFIGPATH := /etc/xdg
 INSTALLFLAGS := -Dm755
 CONFIGFLAGS := -Dm644
 
-OS := $(shell uname -o 2> /dev/null)
-
 ifeq ($(OS),Android)
 	INSTALLPATH := $(PREFIX)/bin
 	CONFIGPATH := $(PREFIX)/etc/xdg
@@ -29,7 +27,7 @@ build:
 	meson setup build
 
 clean:
-	meson setup build --wipe
+	rm -rf build
 
 compile: build
 	meson compile -C build albafetch
@@ -45,14 +43,12 @@ deb: compile
 	cd debian; \
 	./makedeb.sh
 
-install: build/albafetch
+install: compile
 	mkdir -p $(INSTALLPATH) $(CONFIGPATH)
 
 	install $(INSTALLFLAGS) build/albafetch $(INSTALLPATH)/albafetch
-
 	install $(CONFIGFLAGS) albafetch.conf $(CONFIGPATH)/albafetch.conf
 
 uninstall:
 	rm $(INSTALLPATH)/albafetch
-
 	rm $(CONFIGPATH)/albafetch.conf
diff --git a/nix/package.nix b/nix/package.nix
@@ -1,6 +1,7 @@
 {
   lib,
   stdenv,
+  apple-sdk_12,
   meson,
   ninja,
   pciutils,
@@ -35,9 +36,12 @@ stdenv.mkDerivation {
 
   src = self;
 
-  buildInputs = [
-    sqlite
-  ] ++ lib.optional stdenv.hostPlatform.isLinux pciutils;
+  buildInputs =
+    [
+      sqlite
+    ]
+    ++ lib.optional stdenv.hostPlatform.isDarwin apple-sdk_12
+    ++ lib.optional stdenv.hostPlatform.isLinux pciutils;
 
   nativeBuildInputs = [
     meson

diff --git a/src/optdeps/libpci.c b/src/optdeps/libpci.c
@@ -46,6 +46,6 @@ void get_gpus(char **gpus) {
 
     pci_cleanup(pacc);  // close everything
 #else
-
-#endif // GLIB_EXISTS
+(void)gpus;
+#endif // LIBPCI_EXISTS
 }