1 files changed, 54 insertions(+), 33 deletions(-)

M gnu/packages/file-systems.scm

@@ 2496,38 2496,59 @@ filtering and ordering functionality.
     (license license:gpl3+)))
 
 (define-public watcher
-  (package
-    (name "watcher")
-    (version "0.13.6")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                     (url "https://github.com/e-dant/watcher")
-                     (commit version)))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "1ikcdskb3z3wggxb12vi0y3rng2hcswl0fpk6sjqqlz34nvwijcr"))))
-    (build-system cmake-build-system)
-    (arguments
-     (list #:configure-flags
-           #~(list "-DBUILD_TESTING=ON"
-                   ;; This is needed to find 'snitch' from the system.
-                   "-DFETCHCONTENT_TRY_FIND_PACKAGE_MODE=ALWAYS")
-           #:phases
-           #~(modify-phases %standard-phases
-               (replace 'check
-                 (lambda* (#:key tests? #:allow-other-keys)
-                   (setenv "PATH" (string-append (getcwd) ":" (getenv "PATH")))
-                   (substitute* "../source/tool/test/.ctx"
-                     (("../../out")
-                      "../../../build")
-                     (("which") "command -v"))
-                   (invoke "../source/tool/test/all"))))))
-    (native-inputs (list jq snitch))
-    (home-page "https://github.com/e-dant/watcher")
-    (synopsis "File system watcher program and library")
-    (description "Watcher may be used as a library or a program that can be
+  (let ((commit "0aff9ee86f0b62f17d7b0105cae6304ef1bcfbb2")
+        (revision "0"))
+    (package
+      (name "watcher")
+      (version (git-version "0.13.6" revision commit))
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference
+                       (url "https://github.com/e-dant/watcher")
+                       (commit commit)))
+                (file-name (git-file-name name version))
+                (sha256
+                 (base32
+                  "10bwdqnhgpsk2w60331npspkqjvdgb0jh2by89g8d3hwfjibk3p4"))))
+      (build-system cmake-build-system)
+      (arguments
+       (list
+        ;; The test suite is currently flaky
+        ;; (see: https://github.com/e-dant/watcher/issues/85).
+        #:tests? #f
+        #:configure-flags
+        #~(list "-DBUILD_TESTING=ON"
+                ;; This is needed to find 'snitch' from the system.
+                "-DFETCHCONTENT_TRY_FIND_PACKAGE_MODE=ALWAYS")
+        #:phases
+        #~(modify-phases %standard-phases
+            (add-after 'unpack 'fix-.pc-files-prefix
+              ;; There are some issues with the new .pc files (see:
+              ;; <https://github.com/e-dant/watcher/issues/82>).
+              (lambda _
+                (substitute* "CMakeLists.txt"
+                  (("\"\\$\\{CMAKE_INSTALL_LIBDIR}\"")
+                   "\"${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}\"")
+                  (("\\$\\{CMAKE_INSTALL_INCLUDEDIR}/wtr")
+                   "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}/wtr"))
+                (substitute* "watcher.pc.in"
+                  (("@PC_WATCHER_PREFIX@")
+                   #$output))
+                (substitute* "watcher-c/watcher-c.pc.in"
+                  (("@PC_LIBWATCHER_C_PREFIX@")
+                   #$output))))
+            (replace 'check
+              (lambda* (#:key tests? #:allow-other-keys)
+                (when tests?
+                  (setenv "PATH" (string-append (getcwd) ":" (getenv "PATH")))
+                  (substitute* "../source/tool/test/.ctx"
+                    (("../../out")
+                     "../../../build"))
+                  (invoke "../source/tool/test/all")))))))
+      (native-inputs (list jq snitch))
+      (home-page "https://github.com/e-dant/watcher")
+      (synopsis "File system watcher program and library")
+      (description "Watcher may be used as a library or a program that can be
 used to efficiently watch a file system for changes.  This package provides
 the following components:
 @table @asis


@@ 2540,4 2561,4 @@ Command-line interface (CLI)
 @item @command{tw}
 Minimal, more human-readable CLI variant
 @end table")
-    (license license:expat)))
+      (license license:expat))))