dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

lsyncd: update xnu include path; fix darwin (#352506)

Browse Source
This commit is contained in:
Theodore Ni 2024-11-01 10:50:32 -07:00 committed by GitHub
commit b2f76a0588
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/applications/networking/sync/lsyncd/default.nix
View File

@ -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";

1
pkgs/top-level/all-packages.nix
View File

@ -9138,7 +9138,6 @@ with pkgs;
lsdvd = callPackage ../tools/cd-dvd/lsdvd { };
lsyncd = callPackage ../applications/networking/sync/lsyncd {
inherit (darwin) xnu;
lua = lua5_2_compat;
};