diff --git a/pkgs/by-name/gi/gitstatus/package.nix b/pkgs/by-name/gi/gitstatus/package.nix index cc6037d16c21..04afd67b7c21 100644 --- a/pkgs/by-name/gi/gitstatus/package.nix +++ b/pkgs/by-name/gi/gitstatus/package.nix @@ -5,6 +5,7 @@ fetchFromGitHub, git, zsh, + zlib, runtimeShell, }: stdenv.mkDerivation rec { @@ -18,11 +19,18 @@ stdenv.mkDerivation rec { sha256 = "sha256-b+9bwJ87VV6rbOPobkwMkDXGH34STjYPlt8wCRR5tEc="; }; - env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { - NIX_LDFLAGS = "-liconv"; - }; + env.NIX_LDFLAGS = toString ( + [ + # required by libgit2.a + "-lz" + ] + ++ lib.optional stdenv.hostPlatform.isDarwin "-liconv" + ); - buildInputs = [ (callPackage ./romkatv_libgit2.nix { }) ]; + buildInputs = [ + zlib + (callPackage ./romkatv_libgit2.nix { }) + ]; postPatch = '' sed -i '1i GITSTATUS_AUTO_INSTALL=''${GITSTATUS_AUTO_INSTALL-0}' gitstatus.plugin.sh diff --git a/pkgs/by-name/gi/gitstatus/romkatv_libgit2.nix b/pkgs/by-name/gi/gitstatus/romkatv_libgit2.nix index 9881bd480406..e1feb240c7b1 100644 --- a/pkgs/by-name/gi/gitstatus/romkatv_libgit2.nix +++ b/pkgs/by-name/gi/gitstatus/romkatv_libgit2.nix @@ -5,7 +5,6 @@ libgit2.overrideAttrs (oldAttrs: { "-DBUILD_CLAR=OFF" "-DBUILD_SHARED_LIBS=OFF" "-DREGEX_BACKEND=builtin" - "-DUSE_BUNDLED_ZLIB=ON" "-DUSE_GSSAPI=OFF" "-DUSE_HTTPS=OFF" "-DUSE_HTTP_PARSER=builtin" # overwritten from libgit2