diff options
| author | Alyssa Ross <hi@alyssa.is> | 2022-12-06 19:57:55 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-02-08 13:48:30 +0000 |
| commit | bf3aadfdd39aa197e18bade671fab6726349ffa4 (patch) | |
| tree | 698567af766ed441d757b57a7b21e68d4a342a2b /nixpkgs/pkgs/development/libraries/yder | |
| parent | f4afc5a01d9539ce09e47494e679c51f80723d07 (diff) | |
| parent | 99665eb45f58d959d2cb9e49ddb960c79d596f33 (diff) | |
| download | nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.gz nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.bz2 nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.lz nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.xz nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.zst nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.zip | |
Merge commit '99665eb45f58d959d2cb9e49ddb960c79d596f33'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/yder')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/yder/default.nix | 9 | ||||
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/yder/fix-pkgconfig.patch | 14 |
2 files changed, 11 insertions, 12 deletions
diff --git a/nixpkgs/pkgs/development/libraries/yder/default.nix b/nixpkgs/pkgs/development/libraries/yder/default.nix index 9dd55482300c..9ab0f5db747e 100644 --- a/nixpkgs/pkgs/development/libraries/yder/default.nix +++ b/nixpkgs/pkgs/development/libraries/yder/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "yder"; - version = "1.4.15"; + version = "1.4.17"; src = fetchFromGitHub { owner = "babelouest"; repo = pname; rev = "v${version}"; - sha256 = "sha256-hPAL1UngodNbQCCdKulaF5faI0JOjmWdz3q8oyPH7C4="; + sha256 = "sha256-4o1sKxlWeAgZZm01sPV2yIR3xXZwzPJwqcGCkz6+Cfc="; }; patches = [ @@ -39,11 +39,6 @@ stdenv.mkDerivation rec { doCheck = true; - preCheck = '' - export LD_LIBRARY_PATH="$(pwd)''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" - export DYLD_FALLBACK_LIBRARY_PATH="$(pwd):$DYLD_FALLBACK_LIBRARY_PATH" - ''; - meta = with lib; { description = "Logging library for C applications"; homepage = "https://github.com/babelouest/yder"; diff --git a/nixpkgs/pkgs/development/libraries/yder/fix-pkgconfig.patch b/nixpkgs/pkgs/development/libraries/yder/fix-pkgconfig.patch index 61a67c5897b8..f68ce2a0213e 100644 --- a/nixpkgs/pkgs/development/libraries/yder/fix-pkgconfig.patch +++ b/nixpkgs/pkgs/development/libraries/yder/fix-pkgconfig.patch @@ -1,9 +1,13 @@ ---- i/libyder.pc.in -+++ w/libyder.pc.in +--- a/libyder.pc.in ++++ b/libyder.pc.in @@ -1,7 +1,5 @@ -prefix=@CMAKE_INSTALL_PREFIX@ -exec_prefix=@CMAKE_INSTALL_PREFIX@ --libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@ --includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@ +-libdir=@PKGCONFIG_TARGET_LIBDIR@ +-includedir=@PKGCONFIG_TARGET_INCLUDES@ +libdir=@CMAKE_INSTALL_LIBDIR@ -+includedir=@CMAKE_INSTALL_INCLUDEDIR@ ++includedir=@CMAKE_INSTALL_LIBDIR@ + + Name: @PROJECT_NAME@ + Description: @PROJECT_DESCRIPTION@ + |