Unverified Commit b2f76a05 authored by Theodore Ni's avatar Theodore Ni Committed by GitHub
Browse files

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

parents 729d9dde 0da0d8f5

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

+10 −3
Original line number Diff line number Diff line 
{ 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";

pkgs/top-level/all-packages.nix

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















  };