diff options
author | Alyssa Ross <hi@alyssa.is> | 2023-10-20 22:09:03 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2023-10-20 22:09:03 +0000 |
commit | 50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e (patch) | |
tree | f2556b911180125ccbb7ed0e78a54e92da89adce /nixpkgs/pkgs/development/libraries/yajl/default.nix | |
parent | 4c16d4548a98563c9d9ad76f4e5b2202864ccd54 (diff) | |
parent | cfc75eec4603c06503ae750f88cf397e00796ea8 (diff) | |
download | nixlib-50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e.tar nixlib-50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e.tar.gz nixlib-50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e.tar.bz2 nixlib-50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e.tar.lz nixlib-50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e.tar.xz nixlib-50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e.tar.zst nixlib-50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e.zip |
Merge commit 'cfc75eec4603c06503ae750f88cf397e00796ea8'
Conflicts: nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/yajl/default.nix')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/yajl/default.nix | 27 |
1 files changed, 20 insertions, 7 deletions
diff --git a/nixpkgs/pkgs/development/libraries/yajl/default.nix b/nixpkgs/pkgs/development/libraries/yajl/default.nix index 022284b0b130..dad884c24842 100644 --- a/nixpkgs/pkgs/development/libraries/yajl/default.nix +++ b/nixpkgs/pkgs/development/libraries/yajl/default.nix @@ -1,18 +1,30 @@ -{ lib, stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake, which, testers }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "yajl"; - version = "2.1.0"; + version = "unstable-2022-04-20"; src = fetchFromGitHub { - owner = "lloyd"; + owner = "containers"; repo = "yajl"; - rev = "refs/tags/${version}"; - sha256 = "00yj06drb6izcxfxfqlhimlrb089kka0w0x8k27pyzyiq7qzcvml"; + rev = "49923ccb2143e36850bcdeb781e2bcdf5ce22f15"; + hash = "sha256-9bMPA5FpyBp8fvG/kkT/MnhYtdqg3QzOnmDFXKwJVW0="; }; + patches = [ + # https://github.com/containers/yajl/pull/1 + ./cmake-shared-static-fix.patch + ]; + nativeBuildInputs = [ cmake ]; + doCheck = true; + nativeCheckInputs = [ which ]; + + passthru = { + tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + }; + meta = { description = "Yet Another JSON Library"; longDescription = '' @@ -21,7 +33,8 @@ stdenv.mkDerivation rec { ''; homepage = "http://lloyd.github.com/yajl/"; license = lib.licenses.isc; + pkgConfigModules = [ "yajl" ]; platforms = with lib.platforms; linux ++ darwin; maintainers = with lib.maintainers; [ maggesi ]; }; -} +}) |