From 49914d2de7fca499b9ac08585282322589a4b8f7 Mon Sep 17 00:00:00 2001 From: Daniel Firth <dan.firth@homotopic.tech> Date: Fri, 3 Nov 2023 18:01:25 +0000 Subject: [PATCH] sdl2 hack --- configuration/common.nix | 29 ++++++++++++++++++++++++++--- 1 file changed, 26 insertions(+), 3 deletions(-) diff --git a/configuration/common.nix b/configuration/common.nix index 1b5b85ae..3d2bdc03 100644 --- a/configuration/common.nix +++ b/configuration/common.nix @@ -22,9 +22,32 @@ final: prev: { text-icu = prev.callPackage ../pkgs/text-icu.nix { icu-i18n = pkgs.icu; }; - sdl2-image = addPkgconfigDepends prev.sdl2-image [ pkgs.libtiff pkgs.libdeflate pkgs.libwebp ]; - - sdl2-mixer = addPkgconfigDepends prev.sdl2-mixer [ pkgs.glib pkgs.pcre2 pkgs.libsndfile pkgs.libpulseaudio pkgs.alsa-lib pkgs.jack2 ]; + sdl2-gfx = addSetupDepends + (overrideCabal prev.sdl2-gfx + { __onlyPropagateKnownPkgConfigModules = true; } + ) + [ pkgs.pkg-config pkgs.SDL2 ]; + + sdl2-image = + addSetupDepends + (overrideCabal prev.sdl2-image + { __onlyPropagateKnownPkgConfigModules = true; } + ) + [ pkgs.pkg-config pkgs.SDL2 pkgs.libtiff pkgs.libwebp ]; + + sdl2-mixer = + addSetupDepends + (overrideCabal prev.sdl2-mixer + { __onlyPropagateKnownPkgConfigModules = true; } + ) + [ pkgs.pkg-config pkgs.SDL2 pkgs.libsndfile pkgs.libpulseaudio pkgs.alsa-lib pkgs.jack2 pkgs.glib pkgs.pcre2 ]; + + sdl2-ttf = + addSetupDepends + (overrideCabal prev.sdl2-ttf + { __onlyPropagateKnownPkgConfigModules = true; } + ) + [ pkgs.pkg-config pkgs.SDL2 pkgs.SDL2_ttf pkgs.harfbuzz pkgs.freetype pkgs.glib pkgs.pcre2 ]; X11-xft = addPkgconfigDepends prev.X11-xft [ pkgs.expat pkgs.xorg.libXau pkgs.xorg.libXdmcp ]; -- GitLab