From 13d8ee227516ac8b2048f8cad4064b9cd9c06c26 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 7 Jul 2008 11:46:50 +0000 Subject: [PATCH] subversion: install emacs lisp files too svn path=/nixpkgs/trunk/; revision=12296 --- .../version-management/subversion-1.4.x/builder.sh | 2 ++ .../version-management/subversion-1.5.x/default.nix | 9 +++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/subversion-1.4.x/builder.sh b/pkgs/applications/version-management/subversion-1.4.x/builder.sh index 70d78b4a6246..0e28b6e3bdde 100644 --- a/pkgs/applications/version-management/subversion-1.4.x/builder.sh +++ b/pkgs/applications/version-management/subversion-1.4.x/builder.sh @@ -32,6 +32,8 @@ postInstall() { -link http://java.sun.com/j2se/1.4.2/docs/api/ \ subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/*.java fi + ensureDir $out/share/emacs/site-lisp + cp contrib/client-side/psvn/psvn.el contrib/client-side/vc-svn.el $out/share/emacs/site-lisp/ } postInstall=postInstall diff --git a/pkgs/applications/version-management/subversion-1.5.x/default.nix b/pkgs/applications/version-management/subversion-1.5.x/default.nix index e2d1c9aef389..80490d4bab29 100644 --- a/pkgs/applications/version-management/subversion-1.5.x/default.nix +++ b/pkgs/applications/version-management/subversion-1.5.x/default.nix @@ -24,10 +24,10 @@ stdenv.mkDerivation rec { name = "subversion-${version}"; #builder = ./builder.sh; - + src = fetchurl { url = http://subversion.tigris.org/downloads/subversion-1.5.0.tar.bz2; - sha1 = "1236a32521b4d8c02261cdc567f6a33d9623f51f"; + sha256 = "1cwnsi38qjn4wdkyg4hy843dnh18djag60ks2zq9zrjwmhmrnpkm"; }; buildInputs = [zlib apr aprutil] @@ -46,6 +46,11 @@ stdenv.mkDerivation rec { --disable-neon-version-check ''; + postInstall = '' + ensureDir $out/share/emacs/site-lisp + cp contrib/client-side/emacs/*.el $out/share/emacs/site-lisp/ + ''; + passthru = { inherit perlBindings pythonBindings; python = if swig != null && swig ? python then swig.python else null;