gitstatus: unvendor zlib

vendored zlib causes clang build to fail
This commit is contained in:
Reno Dakota
2024-12-25 02:40:11 +00:00
parent 145137c106
commit 2f93866f8b
2 changed files with 12 additions and 5 deletions
+12 -4
View File
@@ -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
@@ -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