Commit 979309e0 authored by Jonas Fierlings's avatar Jonas Fierlings Committed by github-actions[bot]
Browse files

committed: fix build on darwin 

The libz workaround was added in #376192 so that the package built on
darwin. Since upstream has updated their dependency on the `libz-sys`
crate we can build libz from source again.

(cherry picked from commit 4849874f)
parent eb7ae6fa

pkgs/by-name/co/committed/package.nix

+0 −10
Original line number Diff line number Diff line 
{

  lib,

  stdenv,

  fetchFromGitHub,

  rustPlatform,

  versionCheckHook,

  nix-update-script,

  git,

  libz,

}:

let

  version = "1.1.8";
@@ -24,14 +22,6 @@ rustPlatform.buildRustPackage { 


  cargoHash = "sha256-W6znChJaDPKdqACDGrVRyEYWKGRinZKLb/21fze2t0c=";



  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [

    # Until upstream bumps the libz-sys dependency to >= 1.1.15 the build fails on unstable

    # nixpkgs with macOS, because the following commit is not part of libz-sys < 1.1.15:

    # https://github.com/madler/zlib/commit/4bd9a71f3539b5ce47f0c67ab5e01f3196dc8ef9

    # Instead, use the nixpkgs libz so that libz-sys does not have to be built.

    libz

  ];



  nativeCheckInputs = [

    git

  ];