From f0bc0bd3f8bc3ef6f2b4f99f76abef53b64a0778 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliv=C3=A9r=20Falvai?= Date: Tue, 5 Nov 2024 21:29:41 +0100 Subject: [PATCH 1/2] tamatool: fix darwin builds --- pkgs/applications/emulators/tamatool/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/tamatool/default.nix b/pkgs/applications/emulators/tamatool/default.nix index 82cd8e9a25289..4276e11ac96bf 100644 --- a/pkgs/applications/emulators/tamatool/default.nix +++ b/pkgs/applications/emulators/tamatool/default.nix @@ -6,7 +6,6 @@ , libpng , SDL2 , SDL2_image -, darwin # Optionally bundle a ROM file , rom ? null @@ -43,8 +42,6 @@ stdenv.mkDerivation (finalAttrs: { libpng SDL2 SDL2_image - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreFoundation ]; makeFlags = [ @@ -56,6 +53,10 @@ stdenv.mkDerivation (finalAttrs: { "CC=${stdenv.cc.targetPrefix}cc" ]; + env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { + NIX_LDFLAGS = "-framework CoreFoundation"; + }; + desktopItems = [ "linux/tamatool.desktop" ]; installPhase = '' From 94f930a1969bae5b9b2fee1f63763cf0cdbe61b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliv=C3=A9r=20Falvai?= Date: Tue, 5 Nov 2024 21:30:10 +0100 Subject: [PATCH 2/2] tamatool: format with nixpkgs-rfc-style --- .../emulators/tamatool/default.nix | 21 ++++++++++--------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/emulators/tamatool/default.nix b/pkgs/applications/emulators/tamatool/default.nix index 4276e11ac96bf..254d1b8a036be 100644 --- a/pkgs/applications/emulators/tamatool/default.nix +++ b/pkgs/applications/emulators/tamatool/default.nix @@ -1,14 +1,15 @@ -{ lib -, stdenv -, fetchFromGitHub -, zip -, copyDesktopItems -, libpng -, SDL2 -, SDL2_image +{ + lib, + stdenv, + fetchFromGitHub, + zip, + copyDesktopItems, + libpng, + SDL2, + SDL2_image, -# Optionally bundle a ROM file -, rom ? null + # Optionally bundle a ROM file + rom ? null, }: stdenv.mkDerivation (finalAttrs: {