pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #155067 from NickCao/meson-ldconfig

[staging-next] meson: do not update ldconfig cache

authored by

Dmitry Kalinkin and committed by
GitHub 306d5d24 4c54621d

+16
unified split
+4
pkgs/development/tools/build-managers/meson/default.nix
··· 57 57 # unsandboxed non-NixOS builds, see: 58 58 # https://github.com/NixOS/nixpkgs/issues/86131#issuecomment-711051774 59 59 ./boost-Do-not-add-system-paths-on-nix.patch 60 + 61 + # Meson tries to update ld.so.cache which breaks when the target architecture 62 + # differs from the build host's. 63 + ./do-not-update-ldconfig-cache.patch 60 64 ]; 61 65 62 66 setupHook = ./setup-hook.sh;
+12
pkgs/development/tools/build-managers/meson/do-not-update-ldconfig-cache.patch
··· 1 + diff --git a/mesonbuild/minstall.py b/mesonbuild/minstall.py 2 + index cb87faf5c..878ec4cd6 100644 3 + --- a/mesonbuild/minstall.py 4 + +++ b/mesonbuild/minstall.py 5 + @@ -551,7 +551,6 @@ class Installer: 6 + self.install_emptydir(d, dm, destdir, fullprefix) 7 + self.install_data(d, dm, destdir, fullprefix) 8 + self.restore_selinux_contexts(destdir) 9 + - self.apply_ldconfig(dm, destdir) 10 + self.run_install_script(d, destdir, fullprefix) 11 + if not self.did_install_something: 12 + self.log('Nothing to install.')