summary refs log tree commit diff
path: root/pkgs/tools/misc/recutils/default.nix
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2018-08-21 15:36:02 +0200
committerVladimír Čunát <vcunat@gmail.com>2018-08-21 15:36:02 +0200
commit765d695b89fac76f84b1ff9a1a7737753b2d8530 (patch)
treec130c7dc4d7d05e0bcea14be12b7a9dcef2cc642 /pkgs/tools/misc/recutils/default.nix
parent690a8017de9f9e9bed8609c1798d6d4309d9794a (diff)
parentcad8fc3447372043c4a098a3104a03f4990058e4 (diff)
downloadnixlib-765d695b89fac76f84b1ff9a1a7737753b2d8530.tar
nixlib-765d695b89fac76f84b1ff9a1a7737753b2d8530.tar.gz
nixlib-765d695b89fac76f84b1ff9a1a7737753b2d8530.tar.bz2
nixlib-765d695b89fac76f84b1ff9a1a7737753b2d8530.tar.lz
nixlib-765d695b89fac76f84b1ff9a1a7737753b2d8530.tar.xz
nixlib-765d695b89fac76f84b1ff9a1a7737753b2d8530.tar.zst
nixlib-765d695b89fac76f84b1ff9a1a7737753b2d8530.zip
Merge branch 'staging-next'
Security fixes for a few packages are included.
Diffstat (limited to 'pkgs/tools/misc/recutils/default.nix')
-rw-r--r--pkgs/tools/misc/recutils/default.nix10
1 files changed, 6 insertions, 4 deletions
diff --git a/pkgs/tools/misc/recutils/default.nix b/pkgs/tools/misc/recutils/default.nix
index a1fa7dee0836..3dd3baed0996 100644
--- a/pkgs/tools/misc/recutils/default.nix
+++ b/pkgs/tools/misc/recutils/default.nix
@@ -8,14 +8,16 @@ stdenv.mkDerivation rec {
     sha256 = "0cdwa4094x3yx7vn98xykvnlp9rngvd58d19vs3vh5hrvggccg93";
   };
 
-  doCheck = true;
-
   hardeningDisable = [ "format" ];
 
-  buildInputs = [ curl emacs ] ++ (stdenv.lib.optionals doCheck [ check bc ]);
+  buildInputs = [ curl emacs ];
+
+  checkInputs = [ check bc ];
+  doCheck = true;
 
+  # one file fails to compile with emacs 26
   postInstall = ''
-    ${emacs}/bin/emacs -Q -batch -f batch-byte-compile $out/share/emacs/site-lisp/*.el #*/
+    ${emacs}/bin/emacs -Q -batch -f batch-byte-compile $out/share/emacs/site-lisp/*.el || true
   '';
 
   meta = {