diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2022-12-31 23:07:26 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-31 23:07:26 +0100 |
| commit | ec75c32673ea0aa149ff6b4fe216087707b56160 (patch) | |
| tree | 3d6cf25836cfba342e12f4f83f418f1323ebd9e5 /pkgs | |
| parent | 06542b21a03083b894c0b87486aa67b65280a028 (diff) | |
| parent | 73a926b415751a779d18e9f1d63ec5311d3ef760 (diff) | |
| download | nixlib-ec75c32673ea0aa149ff6b4fe216087707b56160.tar nixlib-ec75c32673ea0aa149ff6b4fe216087707b56160.tar.gz nixlib-ec75c32673ea0aa149ff6b4fe216087707b56160.tar.bz2 nixlib-ec75c32673ea0aa149ff6b4fe216087707b56160.tar.lz nixlib-ec75c32673ea0aa149ff6b4fe216087707b56160.tar.xz nixlib-ec75c32673ea0aa149ff6b4fe216087707b56160.tar.zst nixlib-ec75c32673ea0aa149ff6b4fe216087707b56160.zip | |
Merge pull request #207328 from wegank/lsyncd-darwin
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/networking/sync/lsyncd/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 1 |
2 files changed, 3 insertions, 4 deletions
diff --git a/pkgs/applications/networking/sync/lsyncd/default.nix b/pkgs/applications/networking/sync/lsyncd/default.nix index 980e70aff50a..85f30c7f001a 100644 --- a/pkgs/applications/networking/sync/lsyncd/default.nix +++ b/pkgs/applications/networking/sync/lsyncd/default.nix @@ -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; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b7a96d5cb4ed..784b0e510926 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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; }; |