JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Franz Pletz 2023-06-29 18:57:13 +02:00 committed by GitHub
commit 0b47a8bdba
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/minizip-ng/default.nix
View File

@ -14,13 +14,13 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "minizip-ng"; pname = "minizip-ng";
version = "3.0.10"; version = "4.0.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "zlib-ng"; owner = "zlib-ng";
repo = finalAttrs.pname; repo = finalAttrs.pname;
rev = finalAttrs.version; rev = finalAttrs.version;
sha256 = "sha256-ynYAWF570S6MpD1WXbUC3cu+chL3+AhsMHr15l+LYVg="; sha256 = "sha256-YgBOsznV1JtnpLUJeqZ06zvdB3tNbOlFhhLd1pMJhEM=";
}; };
nativeBuildInputs = [ cmake pkg-config ]; nativeBuildInputs = [ cmake pkg-config ];

17
pkgs/development/libraries/zlib-ng/default.nix
View File

@ -1,22 +1,29 @@
{ lib, stdenv, fetchFromGitHub { lib, stdenv, fetchFromGitHub, fetchpatch
, cmake, pkg-config , cmake, pkg-config, gtest
, withZlibCompat ? false , withZlibCompat ? false
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "zlib-ng"; pname = "zlib-ng";
version = "2.0.7"; version = "2.1.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "zlib-ng"; owner = "zlib-ng";
repo = "zlib-ng"; repo = "zlib-ng";
rev = version; 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" ]; outputs = [ "out" "dev" "bin" ];
nativeBuildInputs = [ cmake pkg-config ]; nativeBuildInputs = [ cmake pkg-config gtest ];
cmakeFlags = [ cmakeFlags = [
"-DCMAKE_INSTALL_PREFIX=/" "-DCMAKE_INSTALL_PREFIX=/"