alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #207328 from wegank/lsyncd-darwin

Browse source
This commit is contained in:
Sandro 2022-12-31 23:07:26 +01:00 committed by GitHub
parent 06542b21a0 73a926b415
commit ec75c32673
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/applications/networking/sync/lsyncd/default.nix
View file

@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, lua, pkg-config, rsync,
asciidoc, libxml2, docbook_xml_dtd_45, docbook_xsl, libxslt }:
asciidoc, libxml2, docbook_xml_dtd_45, docbook_xsl, libxslt, xnu }:
stdenv.mkDerivation rec {
pname = "lsyncd";
@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
# Special flags needed on Darwin:
# https://github.com/axkibe/lsyncd/blob/42413cabbedca429d55a5378f6e830f191f3cc86/INSTALL#L51
cmakeFlags = lib.optionals stdenv.isDarwin [ "-DWITH_INOTIFY=OFF" "-DWITH_FSEVENTS=ON" ];
cmakeFlags = lib.optionals stdenv.isDarwin [ "-DWITH_INOTIFY=OFF" "-DWITH_FSEVENTS=ON" "-DXNU_DIR=${xnu}/include" ];
dontUseCmakeBuildDir = true;
@ -44,7 +44,5 @@ stdenv.mkDerivation rec {
license = licenses.gpl2Plus;
platforms = platforms.all;
maintainers = with maintainers; [ bobvanderlinden ];
# never built on aarch64-darwin since first introduction in nixpkgs
broken = stdenv.isDarwin && stdenv.isAarch64;
};
}

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

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