nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-04-17 05:48:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge #319221: jansson: adopt; modernize; add more checks

Browse Source 
...into staging
This commit is contained in:
Vladimír Čunát 2024-07-20 09:29:30 +02:00
commit 726f3ec8b5
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
3 changed files with 52 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
pkgs/by-name/ja/jansson/package.nix Normal file
View File

@ -0,0 +1,52 @@
{
lib,
stdenv,
fetchFromGitHub,
cmake,
nix-update-script,
testers,
validatePkgConfig,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "jansson";
version = "2.14";
outputs = [
"dev"
"out"
];
src = fetchFromGitHub {
owner = "akheron";
repo = "jansson";
rev = "v${finalAttrs.version}";
hash = "sha256-FQgy2+g3AyRVJeniqPQj0KNeHgPdza2pmEIXqSyYry4=";
};
nativeBuildInputs = [
cmake
validatePkgConfig
];
cmakeFlags = [
# networkmanager relies on libjansson.so:
# https://github.com/NixOS/nixpkgs/pull/176302#issuecomment-1150239453
"-DJANSSON_BUILD_SHARED_LIBS=${if stdenv.hostPlatform.isStatic then "OFF" else "ON"}"
];
passthru = {
tests.pkg-config = testers.hasPkgConfigModules { package = finalAttrs.finalPackage; };
updateScript = nix-update-script { };
};
meta = {
description = "C library for encoding, decoding and manipulating JSON data";
homepage = "https://github.com/akheron/jansson";
changelog = "https://github.com/akheron/jansson/raw/${finalAttrs.src.rev}/CHANGES";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ getchoo ];
platforms = lib.platforms.all;
pkgConfigModules = [ "jansson" ];
};
})

30
pkgs/development/libraries/jansson/default.nix
View File

@ -1,30 +0,0 @@
{ lib, stdenv, fetchFromGitHub, cmake }:
stdenv.mkDerivation rec {
pname = "jansson";
version = "2.14";
src = fetchFromGitHub {
owner = "akheron";
repo = "jansson";
rev = "v${version}";
sha256 = "sha256-FQgy2+g3AyRVJeniqPQj0KNeHgPdza2pmEIXqSyYry4=";
};
nativeBuildInputs = [ cmake ];
cmakeFlags = [
# networkmanager relies on libjansson.so:
# https://github.com/NixOS/nixpkgs/pull/176302#issuecomment-1150239453
"-DJANSSON_BUILD_SHARED_LIBS=${if stdenv.hostPlatform.isStatic then "OFF" else "ON"}"
];
meta = with lib; {
homepage = "https://github.com/akheron/jansson";
description = "C library for encoding, decoding and manipulating JSON data";
changelog = "https://github.com/akheron/jansson/raw/v${version}/CHANGES";
license = licenses.mit;
platforms = platforms.all;
maintainers = [ ];
};
}

2
pkgs/top-level/all-packages.nix
View File

@ -21269,8 +21269,6 @@ with pkgs;
jama = callPackage ../development/libraries/jama { };
jansson = callPackage ../development/libraries/jansson { };
jarowinkler-cpp = callPackage ../development/libraries/jarowinkler-cpp { };
jbig2dec = callPackage ../development/libraries/jbig2dec { };