From 13f0ab1e28e8bcb6c71b0dc8ca18551302b13833 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Fri, 25 Dec 2020 14:01:32 +0100 Subject: [PATCH] haskellPackages.apecs-physics: push to 0.4.5 to unbreak build apecs-physics was broken by the update of glibc to 2.32 due to the vendored Chipmunk2D using sys/sysctl.h on GNU/Linux. 0.4.5 updates the vendored version of Chipmunk2D which resolves this issue. Resolves #107358. --- pkgs/development/haskell-modules/configuration-common.nix | 3 ++- .../development/haskell-modules/configuration-hackage2nix.yaml | 3 --- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 655199ca5be..aa3a7386fc9 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1544,7 +1544,8 @@ self: super: { yesod-core = dontCheck super.yesod-core; # Add ApplicationServices on darwin - apecs-physics = addPkgconfigDepends super.apecs-physics + # use 0.4.5 instead of 0.4.4 to fix build with glibc >= 2.32 + apecs-physics = addPkgconfigDepends super.apecs-physics_0_4_5 (pkgs.lib.optional pkgs.stdenv.isDarwin pkgs.darwin.apple_sdk.frameworks.ApplicationServices); } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 129b165d154..95dce67b4be 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -3150,9 +3150,6 @@ broken-packages: - aos-signature - aosd - apart - - apecs-gloss - - apecs-physics - - apecs-physics-gloss - apecs-stm - apelsin - api-builder