summary refs log tree commit diff
path: root/pkgs/tools/misc/recutils
diff options
context:
space:
mode:
authorJan Malakhovski <oxij@oxij.org>2018-08-08 21:35:55 +0000
committerJan Malakhovski <oxij@oxij.org>2018-08-11 09:35:29 +0000
commit3f843e0de600e4d81fbbeaeba0755cebbdee77c9 (patch)
treeaf0f4eb0634d69de47484840a4a10ce0a8e8e2f9 /pkgs/tools/misc/recutils
parent8aeec440822e5d16468c0758980cd0297ff06438 (diff)
downloadnixpkgs-3f843e0de600e4d81fbbeaeba0755cebbdee77c9.tar
nixpkgs-3f843e0de600e4d81fbbeaeba0755cebbdee77c9.tar.gz
nixpkgs-3f843e0de600e4d81fbbeaeba0755cebbdee77c9.tar.bz2
nixpkgs-3f843e0de600e4d81fbbeaeba0755cebbdee77c9.tar.lz
nixpkgs-3f843e0de600e4d81fbbeaeba0755cebbdee77c9.tar.xz
nixpkgs-3f843e0de600e4d81fbbeaeba0755cebbdee77c9.tar.zst
nixpkgs-3f843e0de600e4d81fbbeaeba0755cebbdee77c9.zip
recutils: use checkInputs, fix tests, also fix build
Diffstat (limited to 'pkgs/tools/misc/recutils')
-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 a1fa7dee083..3dd3baed099 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 = {