public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Let hydra build kdesvn and krusader.

Browse Source 
Also fix kdesvn build with qt-4.8.

svn path=/nixpkgs/trunk/; revision=32473
This commit is contained in:
Yury G. Kudryashov 2012-02-22 14:51:15 +00:00
parent 77a8ea6fbd
commit c6f0449124
3 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkgs/applications/misc/krusader/default.nix
View File

@ -12,5 +12,6 @@ stdenv.mkDerivation rec {
license = "GPL"; license = "GPL";
homepage = http://www.krusader.org; homepage = http://www.krusader.org;
maintainers = with stdenv.lib.maintainers; [ sander urkud ]; maintainers = with stdenv.lib.maintainers; [ sander urkud ];
inherit (kdelibs.meta) platforms;
}; };
} }

17
pkgs/applications/version-management/kdesvn/default.nix
View File

@ -1,10 +1,10 @@
{ stdenv, fetchurl, lib, cmake, qt4, perl, gettext, apr, aprutil, subversion, db4 { stdenv, fetchurl, gettext, apr, aprutil, subversion, db4, kdelibs }:
, kdelibs, automoc4, phonon, kde_baseapps }:
stdenv.mkDerivation { stdenv.mkDerivation rec {
name = "kdesvn-1.5.5"; name = "kdesvn-1.5.5";
src = fetchurl { src = fetchurl {
url = http://kdesvn.alwins-world.de/downloads/kdesvn-1.5.5.tar.bz2; url = "${meta.homepage}/downloads/${name}.tar.bz2";
sha256 = "02sb34p04dyd88ksxvpiffhxqwmhs3yv1wif9m8w0fly9hvy1zk7"; sha256 = "02sb34p04dyd88ksxvpiffhxqwmhs3yv1wif9m8w0fly9hvy1zk7";
}; };
@ -12,15 +12,18 @@ stdenv.mkDerivation {
sed -i -e "s|/usr|${subversion}|g" src/svnqt/cmakemodules/FindSubversion.cmake sed -i -e "s|/usr|${subversion}|g" src/svnqt/cmakemodules/FindSubversion.cmake
''; '';
patches = [ ./docbook.patch ]; patches = [ ./docbook.patch ./virtual_inheritance.patch ];
buildInputs = [ cmake qt4 perl gettext apr aprutil subversion db4 kdelibs automoc4 phonon ]; buildInputs = [ apr aprutil subversion db4 kdelibs ];
buildNativeInputs = [ gettext ];
meta = { meta = {
description = "KDE SVN front-end"; description = "KDE SVN front-end";
license = "GPL"; license = "GPL";
homepage = http://kdesvn.alwins-world.de; homepage = http://kdesvn.alwins-world.de;
maintainers = [ lib.maintainers.sander ]; maintainers = [ stdenv.lib.maintainers.sander ];
inherit (kdelibs.meta) platforms;
}; };
} }

11
pkgs/applications/version-management/kdesvn/virtual_inheritance.patch Normal file
View File

@ -0,0 +1,11 @@
--- kdesvn-1.5.5.orig/src/svnfrontend/graphtree/revgraphview.h
+++ kdesvn-1.5.5/src/svnfrontend/graphtree/revgraphview.h
@@ -49,7 +49,7 @@ typedef svn::SharedPointer<KTemporaryFil
/**
@author Rajko Albrecht <ral@alwins-world.de>
*/
-class RevGraphView : virtual public QGraphicsView
+class RevGraphView : public QGraphicsView
{
Q_OBJECT
public: