From a837ba1b8e9d58b7e186daa561c48886b24dbbee Mon Sep 17 00:00:00 2001 From: Grimmauld Date: Wed, 26 Mar 2025 14:40:25 +0100 Subject: [PATCH] SDL2: move to by-name, rename SDL2_classic --- .../SDL2 => by-name/sd/SDL2_classic}/find-headers.patch | 0 .../SDL2/default.nix => by-name/sd/SDL2_classic/package.nix} | 0 .../libraries/SDL2 => by-name/sd/SDL2_classic}/setup-hook.sh | 0 pkgs/top-level/all-packages.nix | 3 ++- 4 files changed, 2 insertions(+), 1 deletion(-) rename pkgs/{development/libraries/SDL2 => by-name/sd/SDL2_classic}/find-headers.patch (100%) rename pkgs/{development/libraries/SDL2/default.nix => by-name/sd/SDL2_classic/package.nix} (100%) rename pkgs/{development/libraries/SDL2 => by-name/sd/SDL2_classic}/setup-hook.sh (100%) diff --git a/pkgs/development/libraries/SDL2/find-headers.patch b/pkgs/by-name/sd/SDL2_classic/find-headers.patch similarity index 100% rename from pkgs/development/libraries/SDL2/find-headers.patch rename to pkgs/by-name/sd/SDL2_classic/find-headers.patch diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/by-name/sd/SDL2_classic/package.nix similarity index 100% rename from pkgs/development/libraries/SDL2/default.nix rename to pkgs/by-name/sd/SDL2_classic/package.nix diff --git a/pkgs/development/libraries/SDL2/setup-hook.sh b/pkgs/by-name/sd/SDL2_classic/setup-hook.sh similarity index 100% rename from pkgs/development/libraries/SDL2/setup-hook.sh rename to pkgs/by-name/sd/SDL2_classic/setup-hook.sh diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5812fa981add..12cd1cdf919c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10182,8 +10182,9 @@ with pkgs; }; SDL = SDL_compat; + SDL2 = SDL2_classic; - SDL2 = callPackage ../development/libraries/SDL2 { + SDL2_classic = callPackage ../by-name/sd/SDL2_classic/package.nix { inherit (darwin.apple_sdk.frameworks) AudioUnit Cocoa CoreAudio CoreServices ForceFeedback OpenGL; };