Skip to content

SDL2: point alias to sdl2-compat #393386

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
K900 merged 9 commits into from
Mar 27, 2025
Merged

SDL2: point alias to sdl2-compat #393386

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
bf18991
movit: explicitly build against libX11
LordGrimmauld Mar 26, 2025
1f2b005
the-powder-toy: explicitly build against libGL and libX11
LordGrimmauld Mar 26, 2025
a837ba1
SDL2: move to by-name, rename SDL2_classic
LordGrimmauld Mar 26, 2025
2f8b5d2
theforceengine: explicitly use SDL2_classic
LordGrimmauld Mar 26, 2025
2532c66
moonlight-qt: explicitly use SDL2_classic
LordGrimmauld Mar 26, 2025
fdd32b7
devilutionx: explicitly use SDL2_classic
LordGrimmauld Mar 26, 2025
d96d13a
SDL2: point alias to sdl2-compat
LordGrimmauld Mar 26, 2025
0c698e0
sdl2-compat: add grimmauld to maintainers
LordGrimmauld Mar 26, 2025
1fbe3a7
sdl2-compat: add marcin-serwin to maintainers
LordGrimmauld Mar 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pkgs/by-name/mo/moonlight-qt/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
qt6,
pkg-config,
vulkan-headers,
SDL2,
SDL2_classic,
SDL2_ttf,
ffmpeg,
libopus,
Expand Down Expand Up @@ -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
Expand Down
4 changes: 4 additions & 0 deletions pkgs/by-name/mo/movit/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
darwin,
eigen,
libepoxy,
libGL,
libX11,
}:

stdenv.mkDerivation rec {
Expand Down Expand Up @@ -36,6 +38,8 @@ stdenv.mkDerivation rec {
SDL2
fftw
gtest
libGL
libX11
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
darwin.apple_sdk.frameworks.OpenGL
Expand Down
0 ...lopment/libraries/SDL2/find-headers.patch → ...y-name/sd/SDL2_classic/find-headers.patch
View file
Open in desktop
File renamed without changes.
0 pkgs/development/libraries/SDL2/default.nix → pkgs/by-name/sd/SDL2_classic/package.nix
View file
Open in desktop
File renamed without changes.
0 .../development/libraries/SDL2/setup-hook.sh → pkgs/by-name/sd/SDL2_classic/setup-hook.sh
View file
Open in desktop
File renamed without changes.
6 changes: 5 additions & 1 deletion pkgs/by-name/sd/sdl2-compat/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,11 @@ 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
marcin-serwin
];
platforms = lib.platforms.all;
pkgConfigModules = [ "sdl2_compat" ];
};
Expand Down
2 changes: 2 additions & 0 deletions pkgs/by-name/th/the-powder-toy/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
jsoncpp,
lib,
libpng,
libX11,
lua,
luajit,
meson,
Expand Down Expand Up @@ -42,6 +43,7 @@ stdenv.mkDerivation rec {
fftwFloat
jsoncpp
libpng
libX11
lua
luajit
SDL2
Expand Down
4 changes: 2 additions & 2 deletions pkgs/by-name/th/theforceengine/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
stdenv,
fetchFromGitHub,
fetchpatch,
SDL2,
SDL2_classic,
SDL2_image,
rtaudio,
rtmidi,
Expand All @@ -16,7 +16,7 @@
}:
let
# package depends on SDL2main static library
SDL2' = SDL2.override {
SDL2' = SDL2_classic.override {
withStatic = true;
};
in
Expand Down
4 changes: 2 additions & 2 deletions pkgs/games/devilutionx/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
pkg-config,
gettext,
libsodium,
SDL2,
SDL2_classic,
SDL2_image,
SDL_audiolib,
flac,
Expand Down Expand Up @@ -99,7 +99,7 @@ stdenv.mkDerivation rec {
fmt
libpng
libsodium
SDL2
SDL2_classic
SDL2_image
SDL_audiolib'
];
Expand Down
5 changes: 3 additions & 2 deletions pkgs/top-level/all-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10182,8 +10182,9 @@ with pkgs;
};

SDL = SDL_compat;
SDL2 = sdl2-compat;

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;
};

Expand Down Expand Up @@ -15773,7 +15774,7 @@ with pkgs;

devilutionx = callPackage ../games/devilutionx {
fmt = fmt_9;
SDL2 = SDL2.override {
SDL2_classic = SDL2_classic.override {
withStatic = true;
};
};
Expand Down