Unverified Commit a493d55f authored by Sander's avatar Sander
Browse files

cachix: apply workaround to NixOS#461651 on darwin 

Applies the same workaround used by `hercules-ci-agent` that allows us to correctly resolve symbols from nix libraries.
Re-enables the test suite, since it now builds.
parent da554b73

pkgs/development/haskell-modules/configuration-darwin.nix

+11 −2
Original line number Diff line number Diff line
@@ -335,8 +335,17 @@ self: super: 
      + (old.preBuild or "");

    }) super.hercules-ci-agent;



    # https://github.com/NixOS/nixpkgs/issues/461651

    cachix = dontCheck super.cachix;

    # Template Haskell on Darwin fails to load an available symbol in these

    # transitive dependencies since GHC 9.10.3.

    # See issue https://github.com/NixOS/nixpkgs/issues/461651

    cachix = overrideCabal (old: {

      preBuild = ''

        DYLD_INSERT_LIBRARIES="''${DYLD_INSERT_LIBRARIES:+$DYLD_INSERT_LIBRARIES:}$(pkg-config --variable=libdir nix-store)/libnixstore.dylib:$(pkg-config --variable=libdir nix-util)/libnixutil.dylib"

        export DYLD_INSERT_LIBRARIES

        echo "DYLD_INSERT_LIBRARIES=$DYLD_INSERT_LIBRARIES"

      ''

      + (old.preBuild or "");

    }) super.cachix;



    # Require /usr/bin/security which breaks sandbox

    http-reverse-proxy = dontCheck super.http-reverse-proxy;