diff options
| author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2022-12-22 21:52:15 +0100 |
|---|---|---|
| committer | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2022-12-22 21:52:15 +0100 |
| commit | 73a926b415751a779d18e9f1d63ec5311d3ef760 (patch) | |
| tree | 38a8ece8d9f6712e1f2cb828c33c5bfff048b818 /pkgs | |
| parent | 815e8e0a946613479578216b6859811a16886c45 (diff) | |
| download | nixlib-73a926b415751a779d18e9f1d63ec5311d3ef760.tar nixlib-73a926b415751a779d18e9f1d63ec5311d3ef760.tar.gz nixlib-73a926b415751a779d18e9f1d63ec5311d3ef760.tar.bz2 nixlib-73a926b415751a779d18e9f1d63ec5311d3ef760.tar.lz nixlib-73a926b415751a779d18e9f1d63ec5311d3ef760.tar.xz nixlib-73a926b415751a779d18e9f1d63ec5311d3ef760.tar.zst nixlib-73a926b415751a779d18e9f1d63ec5311d3ef760.zip | |
lsyncd: unbreak on aarch64-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 f1593b7e74a3..d82c002147ea 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8765,6 +8765,7 @@ with pkgs; lsdvd = callPackage ../tools/cd-dvd/lsdvd {}; lsyncd = callPackage ../applications/networking/sync/lsyncd { + inherit (darwin) xnu; lua = lua5_2_compat; }; |