zellij: make sure to link to our provided curl

Author: r-vdp

pkgs/tools/misc/zellij/default.nix

@@ -4,6 +4,7 @@
 , stdenv
 , installShellFiles
 , pkg-config
+, curl
 , openssl
 , mandown
 , zellij
@@ -25,20 +26,38 @@ rustPlatform.buildRustPackage rec {
 
   env.OPENSSL_NO_VENDOR = 1;
 
+  # Workaround for https://github.com/zellij-org/zellij/issues/3720
+  postPatch = ''
+    substituteInPlace zellij-utils/Cargo.toml \
+      --replace-fail 'isahc = "1.7.2"' 'isahc = { version = "1.7.2", default-features = false, features = ["http2", "text-decoding"] }'
+  '';
+
   nativeBuildInputs = [
     mandown
     installShellFiles
     pkg-config
+    (lib.getDev curl)
   ];
 
   buildInputs = [
+    curl
     openssl
   ];
 
   preCheck = ''
     HOME=$TMPDIR
   '';
 
+  # Ensure that we don't vendor curl, but instead link against the libcurl from nixpkgs
+  doInstallCheck = stdenv.hostPlatform.libc == "glibc";
+  installCheckPhase = ''
+    runHook preInstallCheck
+
+    ldd "$out/bin/zellij" | grep libcurl.so
+
+    runHook postInstallCheck
+  '';
+
   postInstall = ''
     mandown docs/MANPAGE.md > zellij.1
     installManPage zellij.1