-
-
Notifications
You must be signed in to change notification settings - Fork 14k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
neovim: improve lpeg patch for darwin #351423
base: master
Are you sure you want to change the base?
Conversation
(luapkgs.lpeg.overrideAttrs (oa: { | ||
preConfigure = '' | ||
# neovim wants clang .dylib | ||
sed -i makefile -e "s/CC = gcc/CC = clang/" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can we use substituteInPlace --replace-fail
for all of these? Probably would have noticed the difference in patching sooner.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good idea. It still looks like it builds fine.
Btw, I don't think that the last substitution (removing the linux
make target) is necessary as we run make macosx
anyway in the preBuild
anyway.
Can you enlighten us on this @hurricanehrndz ?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is the recursive diff between derivation A obtained with:
preConfigure = ''
sed -i makefile -e "s/CC = gcc/CC = clang/"
sed -i makefile -e "s/-bundle/-dynamiclib/"
sed -i makefile -e "s/lpeg.so/lpeg.dylib/"
sed -i makefile -e '/^linux:$/ {N; d;}'
'';
and derivation B obtained with:
preConfigure = ''
substituteInPlace Makefile \
--replace-fail "CC = gcc" "CC = clang" \
--replace-fail "-bundle" "-dynamiclib" \
--replace-fail "lpeg.so" "lpeg.dylib"
'';
❮ diff -r /nix/store/xidrlc8ni9jmxaw95bvfr8rjh3ylc7p5-luajit2.1-lpeg-1.1.0-1 /nix/store/vsn8wlr6i6zgy7h41gb567xm0n187fzg-luajit2.1-lpeg-1.1.0-1
Binary files /nix/store/xidrlc8ni9jmxaw95bvfr8rjh3ylc7p5-luajit2.1-lpeg-1.1.0-1/lib/lua/5.1/lpeg.dylib and /nix/store/vsn8wlr6i6zgy7h41gb567xm0n187fzg-luajit2.1-lpeg-1.1.0-1/lib/lua/5.1/lpeg.dylib differ
diff '--color=auto' -r /nix/store/xidrlc8ni9jmxaw95bvfr8rjh3ylc7p5-luajit2.1-lpeg-1.1.0-1/nix-support/propagated-build-inputs /nix/store/vsn8wlr6i6zgy7h41gb567xm0n187fzg-luajit2.1-lpeg-1.1.0-1/nix-support/propagated-build-inputs
1c1
< /nix/store/m8nihfxqggb2zgvvd7nd7rmd8rb3y52h-luajit-2.1.1713773202
\ No newline at end of file
---
> /nix/store/3y1m37q82iaqkbr02rp15a1ynxdrfvnw-luajit-2.1.1713773202
\ No newline at end of file
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I guess that this is not too important, because building twice lpeg
with the same makefile
gives two different binaries.
So I guess that it is fine to go with this new substituteInPlace
-only implem.
Co-authored-by: Carlos Hernandez <carlos@hrndz.ca>
|
|
question: with this amount of rebuilds, should this PR target staging? |
This is a good question. |
Description
Since this neovim commit, the current change we make to the
lpeg
derivation when building neovim on darwin has stopped working.We have noticed it in the neovim-nightly-overlay project.
This modification by @hurricanehrndz solves the issue and is the object of this PR.
Ping relevant people
neovim derivation maintainers: cc @manveru @rvolosatovs
co-maintainer of neovim-nightly-overlay: cc @willruggiano
Commits
Things done
nix.conf
? (See Nix manual)sandbox = relaxed
sandbox = true
nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD"
. Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/
)Add a 👍 reaction to pull requests you find important.