Unverified Commit 9a90c6b6 authored by Florian's avatar Florian Committed by GitHub
Browse files

gitstatus: fix build with GCC14 and on darwin (#368183)

parents d8faea3e 5b8caa6c

pkgs/by-name/gi/gitstatus/package.nix

+13 −5
Original line number Diff line number Diff line
@@ -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
@@ -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 $!

  '';

pkgs/by-name/gi/gitstatus/romkatv_libgit2.nix

+0 −1
Original line number Diff line number Diff line
@@ -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