Unverified Commit 414ef16c authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

Merge pull request #257020 from r-ryantm/auto-update/librist

librist: 0.2.7 -> 0.2.8
parents a45ba81d 717da270
Loading
Loading
Loading
Loading
+14 −0
Original line number Diff line number Diff line
--- a/tools/srp_shared.c
+++ b/tools/srp_shared.c
@@ -173,7 +173,11 @@ void user_verifier_lookup(char * username,
 	if (stat(srpfile, &buf) != 0)
 		return;
 
+#if defined(__APPLE__)
+	*generation = (buf.st_mtimespec.tv_sec << 32) | buf.st_mtimespec.tv_nsec;
+#else
 	*generation = (buf.st_mtim.tv_sec << 32) | buf.st_mtim.tv_nsec;
+#endif
 #endif
 
 	if (!lookup_data || !hashversion)
+7 −2
Original line number Diff line number Diff line
@@ -11,16 +11,21 @@

stdenv.mkDerivation rec {
  pname = "librist";
  version = "0.2.7";
  version = "0.2.8";

  src = fetchFromGitLab {
    domain = "code.videolan.org";
    owner = "rist";
    repo = "librist";
    rev = "v${version}";
    sha256 = "sha256-qQG2eRAPAQgxghMeUZk3nwyacX6jDl33F8BWW63nM3c=";
    hash = "sha256-E12TS+N47UQapkF6oO0Lx66Z3lHAyP0R4tVnx/uKBwQ=";
  };

  patches = [
    # https://github.com/NixOS/nixpkgs/pull/257020
    ./darwin.patch
  ];

  nativeBuildInputs = [
    meson
    ninja