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

rure: fix darwin dylib names

Browse source 
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.
This commit is contained in:
sternenseemann 2023-03-13 01:41:18 +01:00
parent c76fb2fef8
commit bc6c2ee545
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -318,11 +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;
# 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 } // 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:

5
pkgs/development/libraries/rure/default.nix
View file

@ -2,6 +2,7 @@
, stdenv , stdenv
, rustPlatform , rustPlatform
, fetchCrate , fetchCrate
, fixDarwinDylibNames
}: }:
let let
@ -27,6 +28,10 @@ rustPlatform.buildRustPackage {
install -Dm644 include/rure.h -t "$dev/include" install -Dm644 include/rure.h -t "$dev/include"
''; '';
nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
fixDarwinDylibNames
];
passthru.updateScript = ./update.sh; passthru.updateScript = ./update.sh;
meta = { meta = {