Skip to content

{ruby,neovim}: fix build with content-addressed derivations #258705

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.

Sign up for GitHub

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

Merged
marsam merged 2 commits into from
Mar 24, 2024
Merged

{ruby,neovim}: fix build with content-addressed derivations #258705

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f391429
ruby: fix build with content-addressed derivations
tie Oct 3, 2023
9305ed3
neovim: fix build with content-addressed derivations
tie Oct 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions pkgs/applications/editors/neovim/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, cmake, gettext, msgpack-c, libtermkey, libiconv
{ lib, stdenv, fetchFromGitHub, removeReferencesTo, cmake, gettext, msgpack-c, libtermkey, libiconv
, libuv, lua, ncurses, pkg-config
, unibilium, gperf
, libvterm-neovim
Expand Down Expand Up @@ -98,6 +98,7 @@ in
cmake
gettext
pkg-config
removeReferencesTo
];

# extra programs test via `make functionaltest`
Expand All @@ -116,8 +117,11 @@ in
sed -i src/nvim/po/CMakeLists.txt \
-e "s|\$<TARGET_FILE:nvim|\${stdenv.hostPlatform.emulator buildPackages} &|g"
'';
postInstall = ''
find "$out" -type f -exec remove-references-to -t ${stdenv.cc} '{}' +
'';
# check that the above patching actually works
disallowedReferences = [ stdenv.cc ] ++ lib.optional (lua != codegenLua) codegenLua;
disallowedRequisites = [ stdenv.cc ] ++ lib.optional (lua != codegenLua) codegenLua;

cmakeFlags = [
# Don't use downloaded dependencies. At the end of the configurePhase one
Expand Down
10 changes: 5 additions & 5 deletions pkgs/development/interpreters/ruby/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ let

strictDeps = true;

nativeBuildInputs = [ autoreconfHook bison ]
nativeBuildInputs = [ autoreconfHook bison removeReferencesTo ]
++ (op docSupport groff)
++ (ops (dtraceSupport && stdenv.isLinux) [ systemtap libsystemtap ])
++ ops yjitSupport [ rustPlatform.cargoSetupHook cargo rustc ]
Expand Down Expand Up @@ -225,10 +225,10 @@ let
${
lib.optionalString (!jitSupport) ''
# Get rid of the CC runtime dependency
${removeReferencesTo}/bin/remove-references-to \
remove-references-to \
-t ${stdenv.cc} \
$out/lib/libruby*
${removeReferencesTo}/bin/remove-references-to \
remove-references-to \
-t ${stdenv.cc} \
$rbConfig
sed -i '/CC_VERSION_MESSAGE/d' $rbConfig
Expand Down Expand Up @@ -270,7 +270,7 @@ let
cp ${./rbconfig.rb} $devdoc/lib/ruby/site_ruby/rbconfig.rb
'' + opString useBaseRuby ''
# Prevent the baseruby from being included in the closure.
${removeReferencesTo}/bin/remove-references-to \
remove-references-to \
-t ${baseRuby} \
$rbConfig $out/lib/libruby*
'';
Expand All @@ -290,7 +290,7 @@ let
'';
doInstallCheck = true;

disallowedRequisites = op (!jitSupport) stdenv.cc.cc
disallowedRequisites = op (!jitSupport) stdenv.cc
++ op useBaseRuby baseRuby;

meta = with lib; {
Expand Down