[FC-41616] overlay: add patchelf-venv

changelog.d/20241113_135856_FC-41616-patched-patchelf_scriv.md

@@ -0,0 +1,22 @@
+<!--
+
+A new changelog entry.
+
+Delete placeholder items that do not apply. Empty sections will be removed
+automatically during release.
+
+Leave the XX.XX as is: this is a placeholder and will be automatically filled
+correctly during the release and helps when backporting over multiple platform
+branches.
+
+-->
+
+### Impact
+
+- None.
+
+
+### NixOS XX.XX platform
+
+- Adds a package `patchelf-venv` to the platform overlay which contains an implementation
+  for the option `--add-rpath-and-shrink`.

pkgs/overlay.nix

@@ -347,6 +347,18 @@ builtins.mapAttrs (_: patchPhps phpLogPermissionPatch) {
 
   opensearch-dashboards = super.callPackage ./opensearch-dashboards { };
 
+  patchelf-venv = super.patchelf.overrideAttrs ({ patches ? [], ... }: {
+    patches = patches ++ [
+      # Adds `--add-rpath-and-shrink` option, required for convergent deployment
+      # tooling invoking `patchelf` multiple times on a virtualenv (see
+      # `batou_ext.python.FixELFRunPath`)
+      (fetchpatch {
+        url = "https://github.com/flyingcircusio/patchelf/commit/6ffde887d77275323c81c2e091891251b021abb3.patch";
+        hash = "sha256-4Qct2Ez3v6DyUG26JTWt6/tkaqB9h1gYaoaObqhvFS8=";
+      })
+    ];
+  });
+
   percona = self.percona80;
   percona-toolkit = super.perlPackages.PerconaToolkit.overrideAttrs(oldAttrs: {
     # The script uses usr/bin/env perl and the Perl builder adds PERL5LIB to it.

release/important_packages.json

@@ -133,6 +133,7 @@
   "openssl_1_1",
   "openssl_3",
   "openvpn",
+  "patchelf-venv",
   "pcre",
   "pcre2",
   "percona",