about summary refs log tree commit diff
diff options
context:
space:
mode:
authorPeter Simons <simons@cryp.to>2013-01-28 18:00:11 +0100
committerPeter Simons <simons@cryp.to>2013-01-28 18:00:11 +0100
commitbb7a5a1a9e5355028efa4ed80204d028be6281ff (patch)
treec9b273dcf044713a611e93a7aa18844c17b55c40
parentecee1be7f12a48bccdd2c6b362371be16ea56384 (diff)
downloadnixlib-bb7a5a1a9e5355028efa4ed80204d028be6281ff.tar
nixlib-bb7a5a1a9e5355028efa4ed80204d028be6281ff.tar.gz
nixlib-bb7a5a1a9e5355028efa4ed80204d028be6281ff.tar.bz2
nixlib-bb7a5a1a9e5355028efa4ed80204d028be6281ff.tar.lz
nixlib-bb7a5a1a9e5355028efa4ed80204d028be6281ff.tar.xz
nixlib-bb7a5a1a9e5355028efa4ed80204d028be6281ff.tar.zst
nixlib-bb7a5a1a9e5355028efa4ed80204d028be6281ff.zip
ledger-2.6.3: update location of the source code tarball
The source code tarball we used to rely on has disappeared.
-rw-r--r--pkgs/applications/office/ledger/2.6.3.nix42
1 files changed, 14 insertions, 28 deletions
diff --git a/pkgs/applications/office/ledger/2.6.3.nix b/pkgs/applications/office/ledger/2.6.3.nix
index c1cd4b42a02a..603c9ea473e8 100644
--- a/pkgs/applications/office/ledger/2.6.3.nix
+++ b/pkgs/applications/office/ledger/2.6.3.nix
@@ -1,40 +1,26 @@
-# Patchelf fails to hard-code the library paths to ledger's
-# libamounts.so and libledger-2.6.3 shared objects:
-#
-# $ ldd ~/.nix-profile/bin/ledger
-#         linux-vdso.so.1 =>  (0x00007fff513ff000)
-#         libamounts.so.0 => not found
-#         libledger-2.6.3.so => not found
-#         libstdc++.so.6 => /nix/store/3r8kfi33y3lbrsvlx8vzwm74h8178y35-gcc-4.5.1/lib/../lib64/libstdc++.so.6 (0x00007f1f0feee000)
-#         libpcre.so.0 => /nix/store/kfhy189arpj3wrfzpgw8p9ac4g4hfgca-pcre-8.10/lib/libpcre.so.0 (0x00007f1f0fcd3000)
-#         libgmp.so.3 => /nix/store/ji6py9m9w2ray1bmpkmgig9llj1i2ggf-gmp-4.3.2/lib/libgmp.so.3 (0x00007f1f0fa7f000)
-#         libm.so.6 => /nix/store/vxycd107wjbhcj720hzkw2px7s7kr724-glibc-2.12.2/lib/libm.so.6 (0x00007f1f0f7fd000)
-#         libgcc_s.so.1 => /nix/store/3r8kfi33y3lbrsvlx8vzwm74h8178y35-gcc-4.5.1/lib/../lib64/libgcc_s.so.1 (0x00007f1f0f5e8000)
-#         libc.so.6 => /nix/store/vxycd107wjbhcj720hzkw2px7s7kr724-glibc-2.12.2/lib/libc.so.6 (0x00007f1f0f27d000)
-#         /nix/store/vxycd107wjbhcj720hzkw2px7s7kr724-glibc-2.12.2/lib/ld-linux-x86-64.so.2 (0x00007f1f101ef000)
-#
-# Fortunately, libtools builds the program with proper paths hard-coded
-# alread, so we don't need patchelf. Phew!
-
-{stdenv, fetchurl, emacs, gmp, pcre, expat}:
-
-let
-  name = "ledger-2.6.3";
-in
+{ stdenv, fetchurl, emacs, gmp, pcre, expat, autoconf, automake, libtool, texinfo }:
+
 stdenv.mkDerivation {
-  inherit name;
+  name = "ledger-2.6.3";
 
   src = fetchurl {
-    url = "https://github.com/downloads/jwiegley/ledger/${name}.tar.gz";
-    sha256 = "05zpnypcwgck7lwk00pbdlcwa347xsqifxh4zsbbn01m98bx1v5k";
+    url = "https://github.com/jwiegley/ledger/archive/v2.6.3.tar.gz";
+    sha256 = "0fmawai1fakhvdmjrydxp2pl67vk1c1ff54z28xl2k057ws49hnm";
   };
 
-  buildInputs = [ emacs gmp pcre expat ];
+  buildInputs = [ emacs gmp pcre expat autoconf automake libtool texinfo ];
+
+  preConfigure = "autoreconf -vi";
 
   configureFlags = "CPPFLAGS=-DNDEBUG CFLAGS=-O3 CXXFLAGS=-O3";
-  dontPatchELF = true;
+
   doCheck = true;
 
+  # Patchelf breaks the hard-coded rpath to ledger's libamounts.so and
+  # libledger-2.6.3. Fortunately, libtool chooses proper rpaths to begin
+  # with, so we can just disable patchelf to avoid the issue.
+  dontPatchELF = true;
+
   meta = {
     homepage = "http://ledger-cli.org/";
     description = "A double-entry accounting system with a command-line reporting interface";