From cfe303f7a4e70d4ace7315b0530b7c05c197014b Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Wed, 28 Dec 2022 14:02:09 +0100 Subject: [PATCH] ares: refactor against #204303 --- pkgs/applications/emulators/bsnes/ares/default.nix | 6 ++++-- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/emulators/bsnes/ares/default.nix b/pkgs/applications/emulators/bsnes/ares/default.nix index e69befe7de504..78afd4db38350 100644 --- a/pkgs/applications/emulators/bsnes/ares/default.nix +++ b/pkgs/applications/emulators/bsnes/ares/default.nix @@ -16,10 +16,12 @@ , libpulseaudio , openal , udev -, Cocoa -, OpenAL +, darwin }: +let + inherit (darwin.apple_sdk_11_0.frameworks) Cocoa OpenAL; +in stdenv.mkDerivation (finalAttrs: { pname = "ares"; version = "130.1"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f9d6a174f6751..c32651da2ab45 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2162,9 +2162,7 @@ with pkgs; ### APPLICATIONS/EMULATORS/BSNES - ares = darwin.apple_sdk_11_0.callPackage ../applications/emulators/bsnes/ares { - inherit (darwin.apple_sdk_11_0.frameworks) Cocoa OpenAL; - }; + ares = darwin.apple_sdk_11_0.callPackage ../applications/emulators/bsnes/ares { }; bsnes-hd = callPackage ../applications/emulators/bsnes/bsnes-hd { inherit (darwin.apple_sdk.frameworks) Cocoa OpenAL;