diff --git a/pkgs/by-name/ze/zellij/package.nix b/pkgs/by-name/ze/zellij/package.nix index 5d7b348bc1f8..c11f44d4f255 100644 --- a/pkgs/by-name/ze/zellij/package.nix +++ b/pkgs/by-name/ze/zellij/package.nix @@ -14,25 +14,25 @@ rustPlatform.buildRustPackage rec { pname = "zellij"; - version = "0.41.1"; + version = "0.41.2"; src = fetchFromGitHub { owner = "zellij-org"; repo = "zellij"; - rev = "v${version}"; - hash = "sha256-EUoJHM0Jm0uFKFeHhtzon/ZRC615SHfYa1gr4RnCNBw="; + hash = "sha256-xdWfaXWmqFJuquE7n3moUjGuFqKB90OE6lqPuC3onOg="; }; - cargoHash = "sha256-rI3pa0dvC/OVJz8gzD1bM0Q+8OWwvGj+jGDEMSbSb2I="; + # Remove the `vendored_curl` feature in order to link against the libcurl from nixpkgs instead of + # the vendored one + postPatch = '' + substituteInPlace Cargo.toml \ + --replace-fail ', "vendored_curl"' "" + ''; + + cargoHash = "sha256-38hTOsa1a5vpR1i8GK1aq1b8qaJoCE74ewbUOnun+Qs="; 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 @@ -63,7 +63,6 @@ rustPlatform.buildRustPackage rec { '' mandown docs/MANPAGE.md > zellij.1 installManPage zellij.1 - '' + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd $pname \