From 9ff062284801e2df583f862f34bc994a0849b45d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Tue, 2 Nov 2010 13:35:28 +0000 Subject: [PATCH] Kdesvn fixed. At the end it was a wrong docbook type only in one of the docbook files there. The other was fine, and kept me confused for long. svn path=/nixpkgs/trunk/; revision=24571 --- .../version-management/kdesvn/default.nix | 5 +++-- .../version-management/kdesvn/docbook.patch | 13 +++++++++++++ 2 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 pkgs/applications/version-management/kdesvn/docbook.patch diff --git a/pkgs/applications/version-management/kdesvn/default.nix b/pkgs/applications/version-management/kdesvn/default.nix index c063cd6d09a..b6893ba17e1 100644 --- a/pkgs/applications/version-management/kdesvn/default.nix +++ b/pkgs/applications/version-management/kdesvn/default.nix @@ -8,11 +8,12 @@ stdenv.mkDerivation { sha256 = "02sb34p04dyd88ksxvpiffhxqwmhs3yv1wif9m8w0fly9hvy1zk7"; }; - patchPhase = '' + prePatch = '' sed -i -e "s|/usr|${subversion}|g" src/svnqt/cmakemodules/FindSubversion.cmake ''; - makeFlags = [ "VERBOSE=1" ]; + patches = [ ./docbook.patch ]; + buildInputs = [ cmake qt4 perl gettext apr aprutil subversion db4 kdelibs automoc4 phonon ]; diff --git a/pkgs/applications/version-management/kdesvn/docbook.patch b/pkgs/applications/version-management/kdesvn/docbook.patch new file mode 100644 index 00000000000..54f43c77958 --- /dev/null +++ b/pkgs/applications/version-management/kdesvn/docbook.patch @@ -0,0 +1,13 @@ +The name of the dtd changed in kdelibs 4.5, so we need to increase it. + +diff --git a/doc/nl/index.docbook b/doc/nl/index.docbook +index 8747869..a9676aa 100644 +--- a/doc/nl/index.docbook ++++ b/doc/nl/index.docbook +@@ -1,5 +1,5 @@ + +-kdesvn"> + +