Commit 73a926b4 authored by Weijia Wang's avatar Weijia Wang
Browse files

lsyncd: unbreak on aarch64-darwin

parent 815e8e0a

pkgs/applications/networking/sync/lsyncd/default.nix

+2 −4
Original line number Diff line number Diff line 
{ 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;

  };

}

pkgs/top-level/all-packages.nix

+1 −0
Original line number Diff line number Diff line
@@ -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;















  };