From 4e618602f0ae7be65753d51c8c62ccf3074d1118 Mon Sep 17 00:00:00 2001 From: Daniel Nagy Date: Tue, 24 Oct 2023 14:45:00 +0200 Subject: [PATCH 1/3] chickenPackages.chickenEggs.sdl2: fix build on linux Change needed since the enablement of `strictDeps = true`. --- pkgs/development/compilers/chicken/5/overrides.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/chicken/5/overrides.nix b/pkgs/development/compilers/chicken/5/overrides.nix index 270384565a4f..e1a5d5683ed5 100644 --- a/pkgs/development/compilers/chicken/5/overrides.nix +++ b/pkgs/development/compilers/chicken/5/overrides.nix @@ -69,7 +69,10 @@ in addToNativeBuildInputs (lib.optionals (stdenv.system == "x86_64-darwin") [ pkgs.memorymappingHook ]) (addPkgConfig old); sdl-base = addToBuildInputs pkgs.SDL; - sdl2 = addToPropagatedBuildInputsWithPkgConfig pkgs.SDL2; + sdl2 = old: + ((addToPropagatedBuildInputsWithPkgConfig pkgs.SDL2 old) // + # needed for sdl2-config to be in PATH + (addToNativeBuildInputs pkgs.SDL2 old)); sdl2-image = addToBuildInputs pkgs.SDL2_image; sdl2-ttf = addToBuildInputs pkgs.SDL2_ttf; soil = addToPropagatedBuildInputsWithPkgConfig pkgs.libepoxy; From 24e19542cfd8f7b71a0a975c7b371676c3bdc1ab Mon Sep 17 00:00:00 2001 From: Daniel Nagy Date: Tue, 24 Oct 2023 14:45:00 +0200 Subject: [PATCH 2/3] chickenPackages.chickenEggs.sdl2-image: fix build on linux Change needed since the enablement of `strictDeps = true`. --- pkgs/development/compilers/chicken/5/overrides.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/chicken/5/overrides.nix b/pkgs/development/compilers/chicken/5/overrides.nix index e1a5d5683ed5..bbe2bdb31bc2 100644 --- a/pkgs/development/compilers/chicken/5/overrides.nix +++ b/pkgs/development/compilers/chicken/5/overrides.nix @@ -73,7 +73,10 @@ in ((addToPropagatedBuildInputsWithPkgConfig pkgs.SDL2 old) // # needed for sdl2-config to be in PATH (addToNativeBuildInputs pkgs.SDL2 old)); - sdl2-image = addToBuildInputs pkgs.SDL2_image; + sdl2-image = old: + ((addToPropagatedBuildInputsWithPkgConfig pkgs.SDL2_image old) // + # needed for sdl2-config to be in PATH + (addToNativeBuildInputs pkgs.SDL2 old)); sdl2-ttf = addToBuildInputs pkgs.SDL2_ttf; soil = addToPropagatedBuildInputsWithPkgConfig pkgs.libepoxy; sqlite3 = addToBuildInputs pkgs.sqlite; From 291a3c4a4712ec9f46169b8341ae611f2333aa44 Mon Sep 17 00:00:00 2001 From: Daniel Nagy Date: Tue, 24 Oct 2023 14:45:00 +0200 Subject: [PATCH 3/3] chickenPackages.chickenEggs.sdl2-ttf: fix build on linux Change needed since the enablement of `strictDeps = true`. --- pkgs/development/compilers/chicken/5/overrides.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/chicken/5/overrides.nix b/pkgs/development/compilers/chicken/5/overrides.nix index bbe2bdb31bc2..89737e94f489 100644 --- a/pkgs/development/compilers/chicken/5/overrides.nix +++ b/pkgs/development/compilers/chicken/5/overrides.nix @@ -77,7 +77,10 @@ in ((addToPropagatedBuildInputsWithPkgConfig pkgs.SDL2_image old) // # needed for sdl2-config to be in PATH (addToNativeBuildInputs pkgs.SDL2 old)); - sdl2-ttf = addToBuildInputs pkgs.SDL2_ttf; + sdl2-ttf = old: + ((addToPropagatedBuildInputsWithPkgConfig pkgs.SDL2_ttf old) // + # needed for sdl2-config to be in PATH + (addToNativeBuildInputs pkgs.SDL2 old)); soil = addToPropagatedBuildInputsWithPkgConfig pkgs.libepoxy; sqlite3 = addToBuildInputs pkgs.sqlite; stemmer = old: