From c7e6962eb359493251220a1db174dde868013673 Mon Sep 17 00:00:00 2001 From: Hilton Chain Date: Sun, 3 Nov 2024 00:18:52 +0800 Subject: [PATCH] build-system: binary: Use patchelf-0.16 by default. Newer patchelf may break binaries. This commit replaces patchelf with patchelf-0.16 for binary-build-system and nvidia-driver (known affected package). Fixes: https://gitlab.com/nonguix/nonguix/-/issues/350 * nonguix/build-system/binary.scm (default-patchelf): Replace patchelf with patchelf-0.16. * nongnu/packages/nvidia.scm (nvidia-driver)[native-inputs]: Likewise. Signed-off-by: John Kehayias --- nongnu/packages/nvidia.scm | 2 +- nonguix/build-system/binary.scm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nongnu/packages/nvidia.scm b/nongnu/packages/nvidia.scm index de311f6..51449b4 100644 --- a/nongnu/packages/nvidia.scm +++ b/nongnu/packages/nvidia.scm @@ -433,7 +433,7 @@ ACTION==\"unbind\", SUBSYSTEM==\"pci\", ATTR{vendor}==\"0x10de\", ATTR{class}==\ (list soname base)))))) (find-files #$output "\\.so\\."))))))) (supported-systems '("i686-linux" "x86_64-linux")) - (native-inputs (list patchelf)) + (native-inputs (list patchelf-0.16)) (inputs (list egl-gbm egl-wayland diff --git a/nonguix/build-system/binary.scm b/nonguix/build-system/binary.scm index 121162d..eb2a72e 100644 --- a/nonguix/build-system/binary.scm +++ b/nonguix/build-system/binary.scm @@ -41,7 +41,7 @@ ;; Do not use `@' to avoid introducing circular dependencies. (let ((module (resolve-interface '(gnu packages elf)))) - (module-ref module 'patchelf))) + (module-ref module 'patchelf-0.16))) (define (default-glibc) "Return the default glibc package."