From a40dfa4f6483a067003ca0d50324670601cb08e8 Mon Sep 17 00:00:00 2001 From: Et7f3 Date: Wed, 12 Apr 2023 11:39:35 +0300 Subject: [PATCH 1/2] chickenPackages_5.chickenEggs.allegro: Add missing deps --- pkgs/development/compilers/chicken/5/overrides.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/chicken/5/overrides.nix b/pkgs/development/compilers/chicken/5/overrides.nix index e81d17b9df63..4d46e6371d05 100644 --- a/pkgs/development/compilers/chicken/5/overrides.nix +++ b/pkgs/development/compilers/chicken/5/overrides.nix @@ -17,9 +17,8 @@ let broken = old: { meta = old.meta // { broken = true; }; }; brokenOnDarwin = old: { meta = old.meta // { broken = stdenv.isDarwin; }; }; in { - allegro = old: - (brokenOnDarwin old) - // (addToBuildInputsWithPkgConfig [ pkgs.allegro5 pkgs.libglvnd ] old); + allegro = addToBuildInputsWithPkgConfig ([ pkgs.allegro5 pkgs.libglvnd ] + ++ lib.optionals stdenv.isDarwin [ pkgs.darwin.apple_sdk.frameworks.OpenGL ]); breadline = addToBuildInputs pkgs.readline; blas = addToBuildInputsWithPkgConfig pkgs.blas; blosc = addToBuildInputs pkgs.c-blosc; From 6b7f0fbe8a3f670a046d411a335ed924bb8026db Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Wed, 12 Apr 2023 13:37:58 +0300 Subject: [PATCH 2/2] chickenPackages_5.chickenEggs.opencl: unbreak on darwin --- pkgs/development/compilers/chicken/5/overrides.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/chicken/5/overrides.nix b/pkgs/development/compilers/chicken/5/overrides.nix index 4d46e6371d05..597cf6783c5e 100644 --- a/pkgs/development/compilers/chicken/5/overrides.nix +++ b/pkgs/development/compilers/chicken/5/overrides.nix @@ -44,9 +44,8 @@ in { mdh = old: (brokenOnDarwin old) // (addToBuildInputs pkgs.pcre old); nanomsg = addToBuildInputs pkgs.nanomsg; ncurses = addToBuildInputsWithPkgConfig [ pkgs.ncurses ]; - opencl = old: - (brokenOnDarwin old) - // (addToBuildInputs [ pkgs.opencl-headers pkgs.ocl-icd ] old); + opencl = addToBuildInputs ([ pkgs.opencl-headers pkgs.ocl-icd ] + ++ lib.optionals stdenv.isDarwin [ pkgs.darwin.apple_sdk.frameworks.OpenCL ]); opengl = old: (brokenOnDarwin old) // (addToBuildInputsWithPkgConfig [ pkgs.libGL pkgs.libGLU ] old);