NixOS · Aug 5, 2019 · Aug 5, 2019 · Aug 9, 2019
Showing with 17 additions and 173 deletions.

+14 −3 pkgs/development/libraries/orcania/default.nix

+3 −11 pkgs/development/libraries/yder/default.nix

+0 −159 pkgs/development/libraries/yder/fix-darwin.patch
diff --git a/pkgs/development/libraries/orcania/default.nix b/pkgs/development/libraries/orcania/default.nix
@@ -1,17 +1,28 @@
-{ stdenv, fetchFromGitHub, cmake }:
+{ stdenv, fetchFromGitHub, cmake, check, subunit }:
 stdenv.mkDerivation rec {
   pname = "orcania";
-  version = "2.0.0";
+  version = "2.0.1";
 
   src = fetchFromGitHub {
     owner = "babelouest";
     repo = pname;
     rev = "v${version}";
-    sha256 = "11ihbfm7qbqf55wdi7azqx75ggd3l0n8ybyq2ikidffvmg13l4g9";
+    sha256 = "1kq1cpayflh4xy442q6prrkalm8lcz2cxydrp1fv8ppq1cnq4zr7";
   };
 
   nativeBuildInputs = [ cmake ];
 
+  checkInputs = [ check subunit ];
+
+  cmakeFlags = [ "-DBUILD_ORCANIA_TESTING=on" ];
+
+  doCheck = true;
+
+  preCheck = ''
+    export LD_LIBRARY_PATH="$(pwd):$LD_LIBRARY_PATH"
+    export DYLD_FALLBACK_LIBRARY_PATH="$(pwd):$DYLD_FALLBACK_LIBRARY_PATH"
+  '';
+
   meta = with stdenv.lib; {
     description = "Potluck with different functions for different purposes that can be shared among C programs";
     homepage = "https://github.com/babelouest/orcania";

diff --git a/pkgs/development/libraries/yder/default.nix b/pkgs/development/libraries/yder/default.nix
@@ -4,28 +4,19 @@
 assert withSystemd -> systemd != null;
 stdenv.mkDerivation rec {
   pname = "yder";
-  version = "1.4.6";
+  version = "1.4.7";
 
   src = fetchFromGitHub {
     owner = "babelouest";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0j46v93vn130gjcr704rkdiibbk3ampzsqb6xdcrn4x115gwyf5i";
+    sha256 = "19ghiwpi972wjqvlgg576nk2nkf1ii5l1kvzb056496xfmlysrwa";
   };
 
   patches = [
     # We set CMAKE_INSTALL_LIBDIR to the absolute path in $out, so
     # prefix and exec_prefix cannot be $out, too
     ./fix-pkgconfig.patch
-
-    # - ORCANIA_LIBRARIES must be set before target_link_libraries is called
-    # - librt is not available, nor needed on Darwin
-    # - The test binary is not linked against all necessary libraries
-    # - Test for journald logging is not systemd specific and fails on darwin
-    # - If the working directory is different from the build directory, the
-    #   dynamic linker can't find libyder
-    # - Return correct error code from y_init_logs when journald is disabled
-    ./fix-darwin.patch
   ];
 
   nativeBuildInputs = [ cmake ];
@@ -42,6 +33,7 @@ stdenv.mkDerivation rec {
 
   preCheck = ''
     export LD_LIBRARY_PATH="$(pwd):$LD_LIBRARY_PATH"
+    export DYLD_FALLBACK_LIBRARY_PATH="$(pwd):$DYLD_FALLBACK_LIBRARY_PATH"
   '';
 
   meta = with lib; {

diff --git a/pkgs/development/libraries/yder/fix-darwin.patch b/pkgs/development/libraries/yder/fix-darwin.patch