lsyncd: update xnu include path; fix darwin

NixOS · Oct 31, 2024 · 0da0d8f · 0da0d8f
1 parent ce8b620
commit 0da0d8f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/pkgs/applications/networking/sync/lsyncd/default.nix b/pkgs/applications/networking/sync/lsyncd/default.nix
@@ -1,6 +1,9 @@
 { lib, stdenv, fetchFromGitHub, cmake, lua, pkg-config, rsync,
-  asciidoc, libxml2, docbook_xml_dtd_45, docbook_xsl, libxslt, xnu }:
+asciidoc, libxml2, docbook_xml_dtd_45, docbook_xsl, libxslt, apple-sdk_11 }:
 
+let
+  xnu = apple-sdk_11.sourceRelease "xnu";
+in
 stdenv.mkDerivation rec {
   pname = "lsyncd";
   version = "2.3.1";
@@ -19,7 +22,11 @@ stdenv.mkDerivation rec {
 
   # Special flags needed on Darwin:
   # https://github.com/axkibe/lsyncd/blob/42413cabbedca429d55a5378f6e830f191f3cc86/INSTALL#L51
-  cmakeFlags = lib.optionals stdenv.hostPlatform.isDarwin [ "-DWITH_INOTIFY=OFF" "-DWITH_FSEVENTS=ON" "-DXNU_DIR=${xnu}/include" ];
+  cmakeFlags = lib.optionals stdenv.hostPlatform.isDarwin [
+    "-DWITH_INOTIFY=OFF"
+    "-DWITH_FSEVENTS=ON"
+    "-DXNU_DIR=${xnu}"
+  ];
 
   dontUseCmakeBuildDir = true;
 
@@ -28,7 +35,7 @@ stdenv.mkDerivation rec {
     rsync
     lua
     asciidoc libxml2 docbook_xml_dtd_45 docbook_xsl libxslt
-  ];
+  ] ++ lib.optional stdenv.hostPlatform.isDarwin apple-sdk_11;
 
   meta = with lib; {
     homepage = "https://github.com/axkibe/lsyncd";

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
@@ -9144,7 +9144,6 @@ with pkgs;
   lsdvd = callPackage ../tools/cd-dvd/lsdvd { };
 
   lsyncd = callPackage ../applications/networking/sync/lsyncd {
-    inherit (darwin) xnu;
     lua = lua5_2_compat;
   };