From 48e8b3992850afa822a3cd1b3340ea3a29ec08e1 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Wed, 22 Feb 2023 13:46:17 +0100 Subject: [PATCH] Revert "haskellPackages.heystone: fix darwin dylibs" This reverts commit 32eecc6cc96ba426cda9a8e7ab66d931eb141cee. Reason for revert: This fix doesn't alleviate the problem in two ways: 1. It is in the aarch64-darwin section of configuration-darwin.nix, the problem appears on x86_64-darwin (bytepatch doesn't support aarch64). 2. When moving the override into the general *-darwin section, the problem with bytepatch is also unaffected, see my attempt in https://github.com/NixOS/nixpkgs/pull/217201. --- pkgs/development/haskell-modules/configuration-darwin.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-darwin.nix b/pkgs/development/haskell-modules/configuration-darwin.nix index 03ef34510bb3d..c54e2dd03d303 100644 --- a/pkgs/development/haskell-modules/configuration-darwin.nix +++ b/pkgs/development/haskell-modules/configuration-darwin.nix @@ -318,8 +318,6 @@ self: super: ({ # https://github.com/NixOS/nixpkgs/issues/149692 Agda = removeConfigureFlag "-foptimise-heavily" super.Agda; - heystone = addBuildTool pkgs.fixDarwinDylibNames super.heystone; - } // lib.optionalAttrs pkgs.stdenv.isx86_64 { # x86_64-darwin # tests appear to be failing to link or something: