diff options
author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-10-23 14:52:21 +0000 |
---|---|---|
committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-10-23 14:52:21 +0000 |
commit | 6dc839d3445e66b259361f08838a8c05b1912e68 (patch) | |
tree | 5ef88f8fe4cb6f75cf0a1c1e821945c7186491c7 /pkgs/desktops/kde-4.5/sdk/kioslave-svn.nix | |
parent | 4309788df022c89765cd7f6b178f4ce7a08db600 (diff) | |
parent | 327a2eae30b48277bd453842d03a144f618822b2 (diff) | |
download | nixlib-6dc839d3445e66b259361f08838a8c05b1912e68.tar nixlib-6dc839d3445e66b259361f08838a8c05b1912e68.tar.gz nixlib-6dc839d3445e66b259361f08838a8c05b1912e68.tar.bz2 nixlib-6dc839d3445e66b259361f08838a8c05b1912e68.tar.lz nixlib-6dc839d3445e66b259361f08838a8c05b1912e68.tar.xz nixlib-6dc839d3445e66b259361f08838a8c05b1912e68.tar.zst nixlib-6dc839d3445e66b259361f08838a8c05b1912e68.zip |
Merging from trunk. I resolved some conflicts; I hope that well.
svn path=/nixpkgs/branches/stdenv-updates/; revision=24429
Diffstat (limited to 'pkgs/desktops/kde-4.5/sdk/kioslave-svn.nix')
-rw-r--r-- | pkgs/desktops/kde-4.5/sdk/kioslave-svn.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/desktops/kde-4.5/sdk/kioslave-svn.nix b/pkgs/desktops/kde-4.5/sdk/kioslave-svn.nix index 29668ba889d9..b88631a03290 100644 --- a/pkgs/desktops/kde-4.5/sdk/kioslave-svn.nix +++ b/pkgs/desktops/kde-4.5/sdk/kioslave-svn.nix @@ -3,7 +3,7 @@ kde.package { buildInputs = [ cmake kdelibs automoc4 subversion apr aprutil ]; - patches = [ ./optional-docs.diff ./find-svn.patch ]; + patches = [ ./find-svn.patch ]; cmakeFlags = "-DBUILD_kioslave=ON"; meta = { @@ -11,7 +11,7 @@ kde.package { kde = { name = "kioslave-svn"; module = "kdesdk"; - version = "4.5.1"; + version = "4.5.2"; }; }; } |