From 40d9cf0c869c014b5954119a2159cbe80ec86e6b Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Wed, 14 Aug 2024 23:11:13 -0300 Subject: [PATCH] doomretro: migrate to by-name --- .../default.nix => by-name/do/doomretro/package.nix} | 5 ++++- pkgs/top-level/all-packages.nix | 4 ---- 2 files changed, 4 insertions(+), 5 deletions(-) rename pkgs/{games/doom-ports/doomretro/default.nix => by-name/do/doomretro/package.nix} (97%) diff --git a/pkgs/games/doom-ports/doomretro/default.nix b/pkgs/by-name/do/doomretro/package.nix similarity index 97% rename from pkgs/games/doom-ports/doomretro/default.nix rename to pkgs/by-name/do/doomretro/package.nix index 794f3c7194ff..f7295496f2cd 100644 --- a/pkgs/games/doom-ports/doomretro/default.nix +++ b/pkgs/by-name/do/doomretro/package.nix @@ -6,9 +6,12 @@ , SDL2 , SDL2_image , SDL2_mixer -, Cocoa +, darwin }: +let + inherit (darwin.apple_sdk.frameworks) Cocoa; +in stdenv.mkDerivation (finalAttrs: { pname = "doomretro"; version = "5.4"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c2031b4382b9..44af45f82e30 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -35414,10 +35414,6 @@ with pkgs; doomseeker = qt5.callPackage ../games/doom-ports/doomseeker { }; - doomretro = callPackage ../games/doom-ports/doomretro { - inherit (darwin.apple_sdk.frameworks) Cocoa; - }; - doomrunner = qt5.callPackage ../games/doom-ports/doomrunner { }; chocolate-doom = callPackage ../games/doom-ports/chocolate-doom { };