Unverified Commit 1e0e75ae authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

Merge pull request #264466 from raphaelr/update/librist 

librist: 0.2.8 -> 0.2.10
parents 8900543e b79e68d1

pkgs/development/libraries/librist/darwin.patch

+4 −2
Original line number Diff line number Diff line 
diff --git a/tools/srp_shared.c b/tools/srp_shared.c

index f782126..23e82a5 100644

--- a/tools/srp_shared.c

+++ b/tools/srp_shared.c

@@ -173,7 +173,11 @@ void user_verifier_lookup(char * username,
@@ -5,9 +7,9 @@ 
 		return;

 

+#if defined(__APPLE__)

+	*generation = (buf.st_mtimespec.tv_sec << 32) | buf.st_mtimespec.tv_nsec;

+	*generation = ((uint64_t)buf.st_mtimespec.tv_sec << 32) | buf.st_mtimespec.tv_nsec;

+#else

 	*generation = (buf.st_mtim.tv_sec << 32) | buf.st_mtim.tv_nsec;

 	*generation = ((uint64_t)buf.st_mtim.tv_sec << 32) | buf.st_mtim.tv_nsec;

+#endif

 #endif

pkgs/development/libraries/librist/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -11,14 +11,14 @@ 


stdenv.mkDerivation rec {

  pname = "librist";

  version = "0.2.8";

  version = "0.2.10";



  src = fetchFromGitLab {

    domain = "code.videolan.org";

    owner = "rist";

    repo = "librist";

    rev = "v${version}";

    hash = "sha256-E12TS+N47UQapkF6oO0Lx66Z3lHAyP0R4tVnx/uKBwQ=";

    hash = "sha256-8N4wQXxjNZuNGx/c7WVAV5QS48Bff5G3t11UkihT+K0=";

  };



  patches = [