Unverified Commit 0b47a8bd authored by Franz Pletz's avatar Franz Pletz Committed by GitHub
Browse files

Merge pull request #238978 from fpletz/pkgs/zlib-ng-2.1.2

parents 73b1a45d 0fe7fee6

pkgs/development/libraries/minizip-ng/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -14,13 +14,13 @@ 


stdenv.mkDerivation (finalAttrs: {

  pname = "minizip-ng";

  version = "3.0.10";

  version = "4.0.0";



  src = fetchFromGitHub {

    owner = "zlib-ng";

    repo = finalAttrs.pname;

    rev = finalAttrs.version;

    sha256 = "sha256-ynYAWF570S6MpD1WXbUC3cu+chL3+AhsMHr15l+LYVg=";

    sha256 = "sha256-YgBOsznV1JtnpLUJeqZ06zvdB3tNbOlFhhLd1pMJhEM=";

  };



  nativeBuildInputs = [ cmake pkg-config ];

pkgs/development/libraries/zlib-ng/default.nix

+12 −5
Original line number Diff line number Diff line 
{ lib, stdenv, fetchFromGitHub

, cmake, pkg-config

{ lib, stdenv, fetchFromGitHub, fetchpatch

, cmake, pkg-config, gtest

, withZlibCompat ? false

}:



stdenv.mkDerivation rec {

  pname = "zlib-ng";

  version = "2.0.7";

  version = "2.1.2";



  src = fetchFromGitHub {

    owner = "zlib-ng";

    repo = "zlib-ng";

    rev = version;

    sha256 = "sha256-Q+u71XXfHafmTL8tmk4XcgpbSdBIunveL9Q78LqiZF0=";

    sha256 = "sha256-6IEH9IQsBiNwfAZAemmP0/p6CTOzxEKyekciuH6pLhw=";

  };



  patches = [

    (fetchpatch {

      url = "https://patch-diff.githubusercontent.com/raw/zlib-ng/zlib-ng/pull/1519.patch";

      hash = "sha256-itobS8kJ2Hj3RfjslVkvEVdQ4t5eeIrsA9muRZt03pE=";

    })

  ];



  outputs = [ "out" "dev" "bin" ];



  nativeBuildInputs = [ cmake pkg-config ];

  nativeBuildInputs = [ cmake pkg-config gtest ];



  cmakeFlags = [

    "-DCMAKE_INSTALL_PREFIX=/"