diff options
| author | sternenseemann <sternenseemann@systemli.org> | 2023-03-13 01:41:18 +0100 |
|---|---|---|
| committer | sternenseemann <sternenseemann@systemli.org> | 2023-03-13 02:15:10 +0100 |
| commit | bc6c2ee545b7e1034a8c298ed4b3c69a21933ae1 (patch) | |
| tree | c1ae48035f017af2dc4371e67b41e0e5429d9c87 | |
| parent | c76fb2fef8f08ed4d0c81df01fb9af712e1dc1fd (diff) | |
| download | nixpkgs-bc6c2ee545b7e1034a8c298ed4b3c69a21933ae1.tar nixpkgs-bc6c2ee545b7e1034a8c298ed4b3c69a21933ae1.tar.gz nixpkgs-bc6c2ee545b7e1034a8c298ed4b3c69a21933ae1.tar.bz2 nixpkgs-bc6c2ee545b7e1034a8c298ed4b3c69a21933ae1.tar.lz nixpkgs-bc6c2ee545b7e1034a8c298ed4b3c69a21933ae1.tar.xz nixpkgs-bc6c2ee545b7e1034a8c298ed4b3c69a21933ae1.tar.zst nixpkgs-bc6c2ee545b7e1034a8c298ed4b3c69a21933ae1.zip | |
rure: fix darwin dylib names
This hasn't been an issue on x86_64, but running it anyways shouldn't hurt. aarch64-darwin's trouble could be due to codesigning? Besides that there don't seem to be many differences between the actual derivations. This also unbreaks the test suite of regex-rure.
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-darwin.nix | 5 | ||||
| -rw-r--r-- | pkgs/development/libraries/rure/default.nix | 5 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/development/haskell-modules/configuration-darwin.nix b/pkgs/development/haskell-modules/configuration-darwin.nix index 1dbb3172b02..c54e2dd03d3 100644 --- a/pkgs/development/haskell-modules/configuration-darwin.nix +++ b/pkgs/development/haskell-modules/configuration-darwin.nix @@ -318,11 +318,6 @@ self: super: ({ # https://github.com/NixOS/nixpkgs/issues/149692 Agda = removeConfigureFlag "-foptimise-heavily" super.Agda; - # regex-rure's test suite fails with a dylib not loaded error due to some - # rpath issue. - regex-rure = dontDistribute (markBroken super.regex-rure); - jacinda = dontDistribute super.jacinda; - } // lib.optionalAttrs pkgs.stdenv.isx86_64 { # x86_64-darwin # tests appear to be failing to link or something: diff --git a/pkgs/development/libraries/rure/default.nix b/pkgs/development/libraries/rure/default.nix index aef8b9c8f3e..1771abd3367 100644 --- a/pkgs/development/libraries/rure/default.nix +++ b/pkgs/development/libraries/rure/default.nix @@ -2,6 +2,7 @@ , stdenv , rustPlatform , fetchCrate +, fixDarwinDylibNames }: let @@ -27,6 +28,10 @@ rustPlatform.buildRustPackage { install -Dm644 include/rure.h -t "$dev/include" ''; + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ + fixDarwinDylibNames + ]; + passthru.updateScript = ./update.sh; meta = { |