nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-04-14 23:27:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #155067 from NickCao/meson-ldconfig

Browse Source 
[staging-next] meson: do not update ldconfig cache
This commit is contained in:
Dmitry Kalinkin 2022-01-15 02:47:35 -05:00 committed by GitHub
commit 306d5d24c1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/tools/build-managers/meson/default.nix
View File

@ -57,6 +57,10 @@ python3.pkgs.buildPythonApplication rec {
# unsandboxed non-NixOS builds, see:
# https://github.com/NixOS/nixpkgs/issues/86131#issuecomment-711051774
./boost-Do-not-add-system-paths-on-nix.patch
# Meson tries to update ld.so.cache which breaks when the target architecture
# differs from the build host's.
./do-not-update-ldconfig-cache.patch
];
setupHook = ./setup-hook.sh;

12
pkgs/development/tools/build-managers/meson/do-not-update-ldconfig-cache.patch Normal file
View File

@ -0,0 +1,12 @@
diff --git a/mesonbuild/minstall.py b/mesonbuild/minstall.py
index cb87faf5c..878ec4cd6 100644
--- a/mesonbuild/minstall.py
+++ b/mesonbuild/minstall.py
@@ -551,7 +551,6 @@ class Installer:
self.install_emptydir(d, dm, destdir, fullprefix)
self.install_data(d, dm, destdir, fullprefix)
self.restore_selinux_contexts(destdir)
- self.apply_ldconfig(dm, destdir)
self.run_install_script(d, destdir, fullprefix)
if not self.did_install_something:
self.log('Nothing to install.')