From 16d30c563d4f26ba2e4c22e3ecf56b60b05ba0c2 Mon Sep 17 00:00:00 2001 From: Grimmauld Date: Sat, 8 Mar 2025 17:36:50 +0100 Subject: [PATCH] treewide: replace references to SDL.dev with lib.getDev SDL --- pkgs/by-name/fi/fish-fillets-ng/package.nix | 2 +- pkgs/by-name/fr/freedroidrpg/package.nix | 2 +- pkgs/by-name/gl/gltron/package.nix | 2 +- pkgs/by-name/hh/hheretic/package.nix | 2 +- pkgs/by-name/hh/hhexen/package.nix | 2 +- pkgs/by-name/sd/SDL_gfx/package.nix | 2 +- pkgs/by-name/sd/SDL_mixer/package.nix | 2 +- pkgs/by-name/sd/SDL_sound/package.nix | 2 +- pkgs/by-name/sd/SDL_ttf/package.nix | 2 +- pkgs/by-name/sp/sparrow3d/package.nix | 2 +- pkgs/development/python-modules/wxpython/4.2.nix | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/fi/fish-fillets-ng/package.nix b/pkgs/by-name/fi/fish-fillets-ng/package.nix index 73011c6bafd3..7c40b658cbfd 100644 --- a/pkgs/by-name/fi/fish-fillets-ng/package.nix +++ b/pkgs/by-name/fi/fish-fillets-ng/package.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { ]; # pass in correct sdl-config for cross builds - env.SDL_CONFIG = lib.getExe' SDL.dev "sdl-config"; + env.SDL_CONFIG = lib.getExe' (lib.getDev SDL) "sdl-config"; makeFlags = [ "AR=${stdenv.cc.targetPrefix}ar" diff --git a/pkgs/by-name/fr/freedroidrpg/package.nix b/pkgs/by-name/fr/freedroidrpg/package.nix index 021abb8c7e9b..d6cdcf46ee3f 100644 --- a/pkgs/by-name/fr/freedroidrpg/package.nix +++ b/pkgs/by-name/fr/freedroidrpg/package.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation { zlib ] ++ lib.optional stdenv.hostPlatform.isDarwin libiconv; - env.SDL_CONFIG = lib.getExe' SDL.dev "sdl-config"; + env.SDL_CONFIG = lib.getExe' (lib.getDev SDL) "sdl-config"; enableParallelBuilding = true; diff --git a/pkgs/by-name/gl/gltron/package.nix b/pkgs/by-name/gl/gltron/package.nix index 1ceebc33f76a..4fe74f8b68b1 100644 --- a/pkgs/by-name/gl/gltron/package.nix +++ b/pkgs/by-name/gl/gltron/package.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { makeFlags = [ "AR=${stdenv.cc.targetPrefix}ar" ]; - env.SDL_CONFIG = lib.getExe' SDL.dev "sdl-config"; + env.SDL_CONFIG = lib.getExe' (lib.getDev SDL) "sdl-config"; buildInputs = [ SDL diff --git a/pkgs/by-name/hh/hheretic/package.nix b/pkgs/by-name/hh/hheretic/package.nix index c2d7a7909ff1..64a3fa9d82ac 100644 --- a/pkgs/by-name/hh/hheretic/package.nix +++ b/pkgs/by-name/hh/hheretic/package.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ autoreconfHook - SDL.dev + (lib.getDev SDL) ]; buildInputs = [ diff --git a/pkgs/by-name/hh/hhexen/package.nix b/pkgs/by-name/hh/hhexen/package.nix index 4d3601cf43f5..4d994f472128 100644 --- a/pkgs/by-name/hh/hhexen/package.nix +++ b/pkgs/by-name/hh/hhexen/package.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ autoreconfHook - SDL.dev + (lib.getDev SDL) ]; buildInputs = [ diff --git a/pkgs/by-name/sd/SDL_gfx/package.nix b/pkgs/by-name/sd/SDL_gfx/package.nix index 65711ff5e396..9b0b74963626 100644 --- a/pkgs/by-name/sd/SDL_gfx/package.nix +++ b/pkgs/by-name/sd/SDL_gfx/package.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { # SDL_gfx.pc refers to sdl.pc and some SDL_gfx headers import SDL.h propagatedBuildInputs = [ SDL ]; - env.SDL_CONFIG = lib.getExe' SDL.dev "sdl-config"; + env.SDL_CONFIG = lib.getExe' (lib.getDev SDL) "sdl-config"; configureFlags = [ (lib.enableFeature false "mmx") diff --git a/pkgs/by-name/sd/SDL_mixer/package.nix b/pkgs/by-name/sd/SDL_mixer/package.nix index bedfda42842a..9a871a71f4ec 100644 --- a/pkgs/by-name/sd/SDL_mixer/package.nix +++ b/pkgs/by-name/sd/SDL_mixer/package.nix @@ -83,7 +83,7 @@ stdenv.mkDerivation (finalAttrs: { ]; # pass in correct *-config for cross builds - env.SDL_CONFIG = lib.getExe' SDL.dev "sdl-config"; + env.SDL_CONFIG = lib.getExe' (lib.getDev SDL) "sdl-config"; env.SMPEG_CONFIG = lib.getExe' smpeg.dev "smpeg-config"; configureFlags = [ diff --git a/pkgs/by-name/sd/SDL_sound/package.nix b/pkgs/by-name/sd/SDL_sound/package.nix index 189a2ac4f67f..1ed4ecd400aa 100644 --- a/pkgs/by-name/sd/SDL_sound/package.nix +++ b/pkgs/by-name/sd/SDL_sound/package.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { (lib.enableFeature enableSdltest "sdltest") ]; - env.SDL_CONFIG = lib.getExe' SDL.dev "sdl-config"; + env.SDL_CONFIG = lib.getExe' (lib.getDev SDL) "sdl-config"; strictDeps = true; diff --git a/pkgs/by-name/sd/SDL_ttf/package.nix b/pkgs/by-name/sd/SDL_ttf/package.nix index 64fc256db640..64c2137d25e2 100644 --- a/pkgs/by-name/sd/SDL_ttf/package.nix +++ b/pkgs/by-name/sd/SDL_ttf/package.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { ]; # pass in correct *-config for cross builds - env.SDL_CONFIG = lib.getExe' SDL.dev "sdl-config"; + env.SDL_CONFIG = lib.getExe' (lib.getDev SDL) "sdl-config"; env.FREETYPE_CONFIG = lib.getExe' freetype.dev "freetype-config"; configureFlags = [ diff --git a/pkgs/by-name/sp/sparrow3d/package.nix b/pkgs/by-name/sp/sparrow3d/package.nix index 6a430bff6fe6..393781481639 100644 --- a/pkgs/by-name/sp/sparrow3d/package.nix +++ b/pkgs/by-name/sp/sparrow3d/package.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: { ]; propagatedBuildInputs = [ - SDL.dev + (lib.getDev SDL) SDL_image SDL_ttf SDL_mixer diff --git a/pkgs/development/python-modules/wxpython/4.2.nix b/pkgs/development/python-modules/wxpython/4.2.nix index 6a5d3debaf40..b8c537ce0d71 100644 --- a/pkgs/development/python-modules/wxpython/4.2.nix +++ b/pkgs/development/python-modules/wxpython/4.2.nix @@ -108,7 +108,7 @@ buildPythonPackage rec { export DOXYGEN=${doxygen}/bin/doxygen export PATH="${wxGTK}/bin:$PATH" - export SDL_CONFIG="${SDL.dev}/bin/sdl-config" + export SDL_CONFIG="${lib.getExe' (lib.getDev SDL) "sdl-config"}" export WAF=$PWD/bin/waf ${python.pythonOnBuildForHost.interpreter} build.py -v --use_syswx dox etg sip --nodoc build_py