nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-23 07:23:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #320233 from LeSuisse/iniparser-4.2.4

Browse Source 
iniparser: 4.2.3 -> 4.2.4
This commit is contained in:
Sandro 2024-06-26 00:51:55 +02:00 committed by GitHub
commit 5e038c6340
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 24 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
pkgs/development/libraries/iniparser/default.nix
View File

@ -1,35 +1,29 @@
{ lib
, stdenv
, fetchFromGitLab
, fetchpatch
, fetchFromGitHub
, substituteAll
, symlinkJoin
, cmake
, doxygen
, ruby
, validatePkgConfig
, testers
{
lib,
stdenv,
fetchFromGitLab,
fetchFromGitHub,
substituteAll,
symlinkJoin,
cmake,
doxygen,
ruby,
validatePkgConfig,
testers,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "iniparser";
version = "4.2.3";
version = "4.2.4";
src = fetchFromGitLab {
owner = "iniparser";
repo = "iniparser";
rev = "v${finalAttrs.version}";
hash = "sha256-rCp9whYPYmVd7saVFILmpdn041u6fYGqe1/Oqc7RaeA=";
hash = "sha256-R069LuOmjCFj7dHXiMjuK7WUupk5+dVd8IDKY/wBn2o=";
};
patches = [
(fetchpatch {
name = "fix-paths-pkgconfig-file.patch";
url = "https://gitlab.com/iniparser/iniparser/-/commit/6a76cd5e97b32014b22d87039bf6f4ee425c79a2.patch";
hash = "sha256-KlTxeOzwBZiLNmuwbbem5c/xspxsflyYfeUaQnGyarI=";
})
] ++ lib.optionals finalAttrs.doCheck [
patches = lib.optionals finalAttrs.doCheck [
(substituteAll {
# Do not let cmake's fetchContent download unity
src = ./remove-fetchcontent-usage.patch;
@ -50,11 +44,13 @@ stdenv.mkDerivation (finalAttrs: {
})
];
nativeBuildInputs = [ cmake doxygen validatePkgConfig ] ++ lib.optionals finalAttrs.doCheck [ ruby ];
nativeBuildInputs = [
cmake
doxygen
validatePkgConfig
] ++ lib.optionals finalAttrs.doCheck [ ruby ];
cmakeFlags = [
"-DBUILD_TESTING=${if finalAttrs.doCheck then "ON" else "OFF"}"
];
cmakeFlags = [ "-DBUILD_TESTING=${if finalAttrs.doCheck then "ON" else "OFF"}" ];
doCheck = false;
@ -64,7 +60,9 @@ stdenv.mkDerivation (finalAttrs: {
passthru.tests = {
pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
iniparser-with-tests = finalAttrs.overrideAttrs (_: { doCheck = true; });
iniparser-with-tests = finalAttrs.overrideAttrs (_: {
doCheck = true;
});
};
meta = with lib; {