summary refs log tree commit diff
path: root/pkgs/applications
diff options
context:
space:
mode:
authorBob van der Linden <bobvanderlinden@gmail.com>2018-08-09 00:09:53 +0200
committerxeji <36407913+xeji@users.noreply.github.com>2018-08-09 00:09:53 +0200
commit7ccc0e32dc2f846b39e8470aba90f95abdb58015 (patch)
tree98252c4417403038bec479c119f7b2411127b206 /pkgs/applications
parent25e4011d758c4d9e523f78597632b94d8d401e58 (diff)
downloadnixlib-7ccc0e32dc2f846b39e8470aba90f95abdb58015.tar
nixlib-7ccc0e32dc2f846b39e8470aba90f95abdb58015.tar.gz
nixlib-7ccc0e32dc2f846b39e8470aba90f95abdb58015.tar.bz2
nixlib-7ccc0e32dc2f846b39e8470aba90f95abdb58015.tar.lz
nixlib-7ccc0e32dc2f846b39e8470aba90f95abdb58015.tar.xz
nixlib-7ccc0e32dc2f846b39e8470aba90f95abdb58015.tar.zst
nixlib-7ccc0e32dc2f846b39e8470aba90f95abdb58015.zip
lsyncd: 2.2.2 -> 2.2.3 (#44770)
Diffstat (limited to 'pkgs/applications')
-rw-r--r--pkgs/applications/networking/sync/lsyncd/default.nix16
1 files changed, 12 insertions, 4 deletions
diff --git a/pkgs/applications/networking/sync/lsyncd/default.nix b/pkgs/applications/networking/sync/lsyncd/default.nix
index 74ffb14f4ade..b0315ee3477d 100644
--- a/pkgs/applications/networking/sync/lsyncd/default.nix
+++ b/pkgs/applications/networking/sync/lsyncd/default.nix
@@ -1,18 +1,26 @@
-{ stdenv, fetchFromGitHub, cmake, lua, pkgconfig, rsync,
+{ stdenv, fetchFromGitHub, fetchpatch, cmake, lua, pkgconfig, rsync,
   asciidoc, libxml2, docbook_xml_dtd_45, docbook_xsl, libxslt }:
 
 stdenv.mkDerivation rec {
   name = "lsyncd-${version}";
-  version = "2.2.2";
+  version = "2.2.3";
 
   src = fetchFromGitHub {
     owner = "axkibe";
     repo = "lsyncd";
     rev = "release-${version}";
-    sha256 = "1q2ixp52r96ckghgmxdbms6xrq8dbziimp8gmgzqfq4lk1v1w80y";
+    sha256 = "1hbsih5hfq9lhgnxm0wb5mrj6xmlk2l0i9a79wzd5f6cnjil9l3x";
   };
 
-  patchPhase = ''
+  patches = [
+    (fetchpatch {
+      sha256 = "0b0h2qxh73l502p7phf6qgl8576nf6fvqqp2x5wy3nz7sc9qb1z8";
+      name = "fix-non-versioned-lua-not-search-in-cmake.patch";
+      url = "https://github.com/axkibe/lsyncd/pull/500/commits/0af99d8d5ba35118e8799684a2d4a8ea4b0c6957.patch";
+    })
+  ];
+
+  postPatch = ''
     substituteInPlace default-rsync.lua \
       --replace "/usr/bin/rsync" "${rsync}/bin/rsync"
   '';