From faf6804b4c45c42554099d664c769fb5aed2eff5 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Thu, 10 Nov 2016 10:59:24 -0800 Subject: Don't build Elisp files in default.nix --- default.nix | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) (limited to 'default.nix') diff --git a/default.nix b/default.nix index 2878e7c2..f0bfdd2f 100644 --- a/default.nix +++ b/default.nix @@ -1,23 +1,35 @@ -{ stdenv, fetchgit, cmake, ninja, boost, gmp, mpfr, libedit, python -, texinfo, doxygen, gnused, lcov }: +{ stdenv, fetchgit, cmake, boost, gmp, mpfr, libedit, python +, texinfo, gnused }: let - rev = "20160111"; + version = "3.1.1"; + rev = "20160906"; in stdenv.mkDerivation { - name = "ledger-3.1.1.${rev}"; - src = builtins.filterSource (path: type: type != "unknown") ./.; + name = "ledger-${version}-${rev}"; - buildInputs = [ cmake ninja doxygen lcov boost gmp mpfr libedit - python texinfo gnused ]; + # NOTE: fetchgit because ledger has submodules not included in the + # default github tarball. + src = ./.; + + buildInputs = [ cmake boost gmp mpfr libedit python texinfo gnused ]; enableParallelBuilding = true; + # Skip byte-compiling of emacs-lisp files because this is currently + # broken in ledger... + postInstall = '' + mkdir -p $out/share/emacs/site-lisp/ + cp -v "$src/lisp/"*.el $out/share/emacs/site-lisp/ + ''; + + cmakeFlags = [ "-DCMAKE_INSTALL_LIBDIR=lib" ]; + meta = { homepage = "http://ledger-cli.org/"; description = "A double-entry accounting system with a command-line reporting interface"; - license = "BSD"; + license = stdenv.lib.licenses.bsd3; longDescription = '' Ledger is a powerful, double-entry accounting system that is accessed @@ -27,6 +39,6 @@ stdenv.mkDerivation { ''; platforms = stdenv.lib.platforms.all; - maintainers = with stdenv.lib.maintainers; [ simons the-kenny jwiegley ]; + maintainers = with stdenv.lib.maintainers; [ the-kenny jwiegley ]; }; } -- cgit v1.2.3