Skip to content

Commit

Permalink
Revert "haskellPackages.heystone: fix darwin dylibs"
Browse files Browse the repository at this point in the history
This reverts commit 32eecc6.

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
   #217201.
  • Loading branch information
sternenseemann committed Feb 23, 2023
1 parent c784c1a commit 7f65851
Showing 1 changed file with 0 additions and 2 deletions.
2 changes: 0 additions & 2 deletions pkgs/development/haskell-modules/configuration-darwin.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down

0 comments on commit 7f65851

Please sign in to comment.