pyrox.dev / nixpkgs
lol
fork atom

SDL2: point alias to sdl2-compat (#393386)

authored by

K900 and committed by
GitHub 2eb139f8 420b54f7

+20 -9
unified split
+2 -2
pkgs/by-name/mo/moonlight-qt/package.nix
··· 6 qt6, 7 pkg-config, 8 vulkan-headers, 9 - SDL2, 10 SDL2_ttf, 11 ffmpeg, 12 libopus, ··· 51 52 buildInputs = 53 [ 54 - (SDL2.override { drmSupport = stdenv.hostPlatform.isLinux; }) 55 SDL2_ttf 56 ffmpeg 57 libopus
··· 6 qt6, 7 pkg-config, 8 vulkan-headers, 9 + SDL2_classic, 10 SDL2_ttf, 11 ffmpeg, 12 libopus, ··· 51 52 buildInputs = 53 [ 54 + (SDL2_classic.override { drmSupport = stdenv.hostPlatform.isLinux; }) 55 SDL2_ttf 56 ffmpeg 57 libopus
+4
pkgs/by-name/mo/movit/package.nix
··· 9 darwin, 10 eigen, 11 libepoxy, 12 }: 13 14 stdenv.mkDerivation rec { ··· 36 SDL2 37 fftw 38 gtest 39 ] 40 ++ lib.optionals stdenv.hostPlatform.isDarwin [ 41 darwin.apple_sdk.frameworks.OpenGL
··· 9 darwin, 10 eigen, 11 libepoxy, 12 + libGL, 13 + libX11, 14 }: 15 16 stdenv.mkDerivation rec { ··· 38 SDL2 39 fftw 40 gtest 41 + libGL 42 + libX11 43 ] 44 ++ lib.optionals stdenv.hostPlatform.isDarwin [ 45 darwin.apple_sdk.frameworks.OpenGL
+5 -1
pkgs/by-name/sd/sdl2-compat/package.nix
··· 102 homepage = "https://libsdl.org"; 103 changelog = "https://github.com/libsdl-org/sdl2-compat/releases/tag/${finalAttrs.src.tag}"; 104 license = lib.licenses.zlib; 105 - maintainers = with lib.maintainers; [ nadiaholmquist ]; 106 platforms = lib.platforms.all; 107 pkgConfigModules = [ "sdl2_compat" ]; 108 };
··· 102 homepage = "https://libsdl.org"; 103 changelog = "https://github.com/libsdl-org/sdl2-compat/releases/tag/${finalAttrs.src.tag}"; 104 license = lib.licenses.zlib; 105 + maintainers = with lib.maintainers; [ 106 + nadiaholmquist 107 + grimmauld 108 + marcin-serwin 109 + ]; 110 platforms = lib.platforms.all; 111 pkgConfigModules = [ "sdl2_compat" ]; 112 };
+2
pkgs/by-name/th/the-powder-toy/package.nix
··· 8 jsoncpp, 9 lib, 10 libpng, 11 lua, 12 luajit, 13 meson, ··· 42 fftwFloat 43 jsoncpp 44 libpng 45 lua 46 luajit 47 SDL2
··· 8 jsoncpp, 9 lib, 10 libpng, 11 + libX11, 12 lua, 13 luajit, 14 meson, ··· 43 fftwFloat 44 jsoncpp 45 libpng 46 + libX11 47 lua 48 luajit 49 SDL2
+2 -2
pkgs/by-name/th/theforceengine/package.nix
··· 3 stdenv, 4 fetchFromGitHub, 5 fetchpatch, 6 - SDL2, 7 SDL2_image, 8 rtaudio, 9 rtmidi, ··· 16 }: 17 let 18 # package depends on SDL2main static library 19 - SDL2' = SDL2.override { 20 withStatic = true; 21 }; 22 in
··· 3 stdenv, 4 fetchFromGitHub, 5 fetchpatch, 6 + SDL2_classic, 7 SDL2_image, 8 rtaudio, 9 rtmidi, ··· 16 }: 17 let 18 # package depends on SDL2main static library 19 + SDL2' = SDL2_classic.override { 20 withStatic = true; 21 }; 22 in
pkgs/development/libraries/SDL2/default.nix pkgs/by-name/sd/SDL2_classic/package.nix
pkgs/development/libraries/SDL2/find-headers.patch pkgs/by-name/sd/SDL2_classic/find-headers.patch
pkgs/development/libraries/SDL2/setup-hook.sh pkgs/by-name/sd/SDL2_classic/setup-hook.sh
+2 -2
pkgs/games/devilutionx/default.nix
··· 8 pkg-config, 9 gettext, 10 libsodium, 11 - SDL2, 12 SDL2_image, 13 SDL_audiolib, 14 flac, ··· 99 fmt 100 libpng 101 libsodium 102 - SDL2 103 SDL2_image 104 SDL_audiolib' 105 ];
··· 8 pkg-config, 9 gettext, 10 libsodium, 11 + SDL2_classic, 12 SDL2_image, 13 SDL_audiolib, 14 flac, ··· 99 fmt 100 libpng 101 libsodium 102 + SDL2_classic 103 SDL2_image 104 SDL_audiolib' 105 ];
+3 -2
pkgs/top-level/all-packages.nix
··· 10179 }; 10180 10181 SDL = SDL_compat; 10182 10183 - SDL2 = callPackage ../development/libraries/SDL2 { 10184 inherit (darwin.apple_sdk.frameworks) AudioUnit Cocoa CoreAudio CoreServices ForceFeedback OpenGL; 10185 }; 10186 ··· 15756 15757 devilutionx = callPackage ../games/devilutionx { 15758 fmt = fmt_9; 15759 - SDL2 = SDL2.override { 15760 withStatic = true; 15761 }; 15762 };
··· 10179 }; 10180 10181 SDL = SDL_compat; 10182 + SDL2 = sdl2-compat; 10183 10184 + SDL2_classic = callPackage ../by-name/sd/SDL2_classic/package.nix { 10185 inherit (darwin.apple_sdk.frameworks) AudioUnit Cocoa CoreAudio CoreServices ForceFeedback OpenGL; 10186 }; 10187 ··· 15757 15758 devilutionx = callPackage ../games/devilutionx { 15759 fmt = fmt_9; 15760 + SDL2_classic = SDL2_classic.override { 15761 withStatic = true; 15762 }; 15763 };