diff options
| author | 7c6f434c <7c6f434c@mail.ru> | 2024-01-20 15:08:57 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-20 15:08:57 +0000 |
| commit | 121c2dcb9701c16d22b2e23fcbea62516e129572 (patch) | |
| tree | 45a2badd9270a42f3b3488e58379ac81eddda732 /pkgs/development/compilers | |
| parent | e8746b898383c6d07221c17f98d7ab420cefb79b (diff) | |
| parent | 32d613548ee37bbf6e9e6778e529fa9d494ec264 (diff) | |
| download | nixlib-121c2dcb9701c16d22b2e23fcbea62516e129572.tar nixlib-121c2dcb9701c16d22b2e23fcbea62516e129572.tar.gz nixlib-121c2dcb9701c16d22b2e23fcbea62516e129572.tar.bz2 nixlib-121c2dcb9701c16d22b2e23fcbea62516e129572.tar.lz nixlib-121c2dcb9701c16d22b2e23fcbea62516e129572.tar.xz nixlib-121c2dcb9701c16d22b2e23fcbea62516e129572.tar.zst nixlib-121c2dcb9701c16d22b2e23fcbea62516e129572.zip | |
Merge pull request #281218 from lf-/jade/fix-diffoscope
diffoscope: fix on aarch64-darwin
Diffstat (limited to 'pkgs/development/compilers')
| -rw-r--r-- | pkgs/development/compilers/fpc/default.nix | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/pkgs/development/compilers/fpc/default.nix b/pkgs/development/compilers/fpc/default.nix index ca16c08b5726..3c9eb60d57c7 100644 --- a/pkgs/development/compilers/fpc/default.nix +++ b/pkgs/development/compilers/fpc/default.nix @@ -36,11 +36,14 @@ stdenv.mkDerivation rec { substituteInPlace fpcsrc/compiler/systems/t_linux.pas --subst-var-by syslibpath "${glibc}/lib" # Replace the `codesign --remove-signature` command with a custom script, since `codesign` is not available # in nixpkgs + # Remove the -no_uuid strip flag which does not work on llvm-strip, only + # Apple strip. substituteInPlace fpcsrc/compiler/Makefile \ --replace \ "\$(CODESIGN) --remove-signature" \ "${./remove-signature.sh}" \ - --replace "ifneq (\$(CODESIGN),)" "ifeq (\$(OS_TARGET), darwin)" + --replace "ifneq (\$(CODESIGN),)" "ifeq (\$(OS_TARGET), darwin)" \ + --replace "-no_uuid" "" ''; NIX_LDFLAGS = lib.optionalString |