Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

gitstatus: fix build with GCC14 and on darwin #368183

Merged
merged 2 commits into from
Dec 26, 2024
Merged

gitstatus: fix build with GCC14 and on darwin #368183

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2f93866
gitstatus: unvendor zlib
paparodeo Dec 25, 2024
5b8caa6
gitstatus: fix darwin build
gador Dec 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 13 additions & 5 deletions pkgs/by-name/gi/gitstatus/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
fetchFromGitHub,
git,
zsh,
zlib,
runtimeShell,
}:
stdenv.mkDerivation rec {
Expand All @@ -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
Expand Down Expand Up @@ -103,7 +111,7 @@ stdenv.mkDerivation rec {
# run zsh as a full-fledged independent process and then wait for it to
# exit. (The "exit" statements in the zshrc ensure that zsh will exit
# almost immediately after starting.)
ZDOTDIR=. zsh -i &
ZDOTDIR=. zsh -d -i &
wait $!
'';

Expand Down
1 change: 0 additions & 1 deletion pkgs/by-name/gi/gitstatus/romkatv_libgit2.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading