From bf18991a551bc0b89b0f2e398f0e79b550c6ba86 Mon Sep 17 00:00:00 2001 From: Grimmauld Date: Wed, 26 Mar 2025 13:21:03 +0100 Subject: [PATCH 1/9] movit: explicitly build against libX11 --- pkgs/by-name/mo/movit/package.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/by-name/mo/movit/package.nix b/pkgs/by-name/mo/movit/package.nix index e285137e459f..ebda6555cd13 100644 --- a/pkgs/by-name/mo/movit/package.nix +++ b/pkgs/by-name/mo/movit/package.nix @@ -9,6 +9,8 @@ darwin, eigen, libepoxy, + libGL, + libX11, }: stdenv.mkDerivation rec { @@ -36,6 +38,8 @@ stdenv.mkDerivation rec { SDL2 fftw gtest + libGL + libX11 ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.OpenGL From 1f2b005a44d990e12fefea6abb0248bfa2563c74 Mon Sep 17 00:00:00 2001 From: Grimmauld Date: Wed, 26 Mar 2025 13:23:22 +0100 Subject: [PATCH 2/9] the-powder-toy: explicitly build against libGL and libX11 --- pkgs/by-name/th/the-powder-toy/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/th/the-powder-toy/package.nix b/pkgs/by-name/th/the-powder-toy/package.nix index b0791b66ccb5..5e752571669e 100644 --- a/pkgs/by-name/th/the-powder-toy/package.nix +++ b/pkgs/by-name/th/the-powder-toy/package.nix @@ -8,6 +8,7 @@ jsoncpp, lib, libpng, + libX11, lua, luajit, meson, @@ -42,6 +43,7 @@ stdenv.mkDerivation rec { fftwFloat jsoncpp libpng + libX11 lua luajit SDL2 From a837ba1b8e9d58b7e186daa561c48886b24dbbee Mon Sep 17 00:00:00 2001 From: Grimmauld Date: Wed, 26 Mar 2025 14:40:25 +0100 Subject: [PATCH 3/9] 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; }; From 2f8b5d2b39062b96d4343c5bc30db873ac1f5971 Mon Sep 17 00:00:00 2001 From: Grimmauld Date: Wed, 26 Mar 2025 14:41:03 +0100 Subject: [PATCH 4/9] theforceengine: explicitly use SDL2_classic --- pkgs/by-name/th/theforceengine/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/th/theforceengine/package.nix b/pkgs/by-name/th/theforceengine/package.nix index 5135dda20a5e..6171b97e6d0d 100644 --- a/pkgs/by-name/th/theforceengine/package.nix +++ b/pkgs/by-name/th/theforceengine/package.nix @@ -3,7 +3,7 @@ stdenv, fetchFromGitHub, fetchpatch, - SDL2, + SDL2_classic, SDL2_image, rtaudio, rtmidi, @@ -16,7 +16,7 @@ }: let # package depends on SDL2main static library - SDL2' = SDL2.override { + SDL2' = SDL2_classic.override { withStatic = true; }; in From 2532c6621107f44e0c857c7a3a0bfe01a5c52c58 Mon Sep 17 00:00:00 2001 From: Grimmauld Date: Wed, 26 Mar 2025 14:42:46 +0100 Subject: [PATCH 5/9] moonlight-qt: explicitly use SDL2_classic --- pkgs/by-name/mo/moonlight-qt/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/mo/moonlight-qt/package.nix b/pkgs/by-name/mo/moonlight-qt/package.nix index dc57ce4678f5..48b68de0d3b2 100644 --- a/pkgs/by-name/mo/moonlight-qt/package.nix +++ b/pkgs/by-name/mo/moonlight-qt/package.nix @@ -6,7 +6,7 @@ qt6, pkg-config, vulkan-headers, - SDL2, + SDL2_classic, SDL2_ttf, ffmpeg, libopus, @@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ - (SDL2.override { drmSupport = stdenv.hostPlatform.isLinux; }) + (SDL2_classic.override { drmSupport = stdenv.hostPlatform.isLinux; }) SDL2_ttf ffmpeg libopus From fdd32b746bc20981557e95d3faad83baf10dd81b Mon Sep 17 00:00:00 2001 From: Grimmauld Date: Wed, 26 Mar 2025 14:42:11 +0100 Subject: [PATCH 6/9] devilutionx: explicitly use SDL2_classic --- pkgs/games/devilutionx/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/games/devilutionx/default.nix b/pkgs/games/devilutionx/default.nix index 87c6accaaad5..c53047136b49 100644 --- a/pkgs/games/devilutionx/default.nix +++ b/pkgs/games/devilutionx/default.nix @@ -8,7 +8,7 @@ pkg-config, gettext, libsodium, - SDL2, + SDL2_classic, SDL2_image, SDL_audiolib, flac, @@ -99,7 +99,7 @@ stdenv.mkDerivation rec { fmt libpng libsodium - SDL2 + SDL2_classic SDL2_image SDL_audiolib' ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 12cd1cdf919c..29ff8d694b1f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15774,7 +15774,7 @@ with pkgs; devilutionx = callPackage ../games/devilutionx { fmt = fmt_9; - SDL2 = SDL2.override { + SDL2_classic = SDL2_classic.override { withStatic = true; }; }; From d96d13a36394c75d27f674c8de61497e0502f30a Mon Sep 17 00:00:00 2001 From: Grimmauld Date: Wed, 26 Mar 2025 18:34:32 +0100 Subject: [PATCH 7/9] SDL2: point alias to sdl2-compat --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 29ff8d694b1f..0a2ec43f46f2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10182,7 +10182,7 @@ with pkgs; }; SDL = SDL_compat; - SDL2 = SDL2_classic; + SDL2 = sdl2-compat; SDL2_classic = callPackage ../by-name/sd/SDL2_classic/package.nix { inherit (darwin.apple_sdk.frameworks) AudioUnit Cocoa CoreAudio CoreServices ForceFeedback OpenGL; From 0c698e01753f4671a923e10dc47771bd583d5d5d Mon Sep 17 00:00:00 2001 From: Grimmauld Date: Wed, 26 Mar 2025 18:36:09 +0100 Subject: [PATCH 8/9] sdl2-compat: add grimmauld to maintainers --- pkgs/by-name/sd/sdl2-compat/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/sd/sdl2-compat/package.nix b/pkgs/by-name/sd/sdl2-compat/package.nix index 0b28b9200e9e..091b6f222054 100644 --- a/pkgs/by-name/sd/sdl2-compat/package.nix +++ b/pkgs/by-name/sd/sdl2-compat/package.nix @@ -102,7 +102,10 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://libsdl.org"; changelog = "https://github.com/libsdl-org/sdl2-compat/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.zlib; - maintainers = with lib.maintainers; [ nadiaholmquist ]; + maintainers = with lib.maintainers; [ + nadiaholmquist + grimmauld + ]; platforms = lib.platforms.all; pkgConfigModules = [ "sdl2_compat" ]; }; From 1fbe3a702e8b91a5dd13fc100244bb5b053313eb Mon Sep 17 00:00:00 2001 From: Grimmauld Date: Wed, 26 Mar 2025 18:42:22 +0100 Subject: [PATCH 9/9] sdl2-compat: add marcin-serwin to maintainers --- pkgs/by-name/sd/sdl2-compat/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/sd/sdl2-compat/package.nix b/pkgs/by-name/sd/sdl2-compat/package.nix index 091b6f222054..571619c61ff7 100644 --- a/pkgs/by-name/sd/sdl2-compat/package.nix +++ b/pkgs/by-name/sd/sdl2-compat/package.nix @@ -105,6 +105,7 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ nadiaholmquist grimmauld + marcin-serwin ]; platforms = lib.platforms.all; pkgConfigModules = [ "sdl2_compat" ];