cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Revert "haskellPackages.heystone: fix darwin dylibs"

Browse source 
This reverts commit 32eecc6cc9.

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.
This commit is contained in:
sternenseemann 2023-02-22 13:46:17 +01:00
parent c784c1a7e8
commit 7f65851908
1 changed files with 0 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/development/haskell-modules/configuration-darwin.nix
View file

@ -318,8 +318,6 @@ self: super: ({
# https://github.com/NixOS/nixpkgs/issues/149692 # https://github.com/NixOS/nixpkgs/issues/149692
Agda = removeConfigureFlag "-foptimise-heavily" super.Agda; Agda = removeConfigureFlag "-foptimise-heavily" super.Agda;
heystone = addBuildTool pkgs.fixDarwinDylibNames super.heystone;
} // lib.optionalAttrs pkgs.stdenv.isx86_64 { # x86_64-darwin } // lib.optionalAttrs pkgs.stdenv.isx86_64 { # x86_64-darwin
# tests appear to be failing to link or something: # tests appear to be failing to link or something: