about summary refs log tree commit diff
path: root/pkgs/desktops/kde-4.5/sdk/kpartloader.nix
diff options
context:
space:
mode:
authorLluís Batlle i Rossell <viric@vicerveza.homeunix.net>2010-10-23 14:52:21 +0000
committerLluís Batlle i Rossell <viric@vicerveza.homeunix.net>2010-10-23 14:52:21 +0000
commit6dc839d3445e66b259361f08838a8c05b1912e68 (patch)
tree5ef88f8fe4cb6f75cf0a1c1e821945c7186491c7 /pkgs/desktops/kde-4.5/sdk/kpartloader.nix
parent4309788df022c89765cd7f6b178f4ce7a08db600 (diff)
parent327a2eae30b48277bd453842d03a144f618822b2 (diff)
downloadnixlib-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/kpartloader.nix')
-rw-r--r--pkgs/desktops/kde-4.5/sdk/kpartloader.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/desktops/kde-4.5/sdk/kpartloader.nix b/pkgs/desktops/kde-4.5/sdk/kpartloader.nix
index 14ccfe2860fa..4b5938cbac1e 100644
--- a/pkgs/desktops/kde-4.5/sdk/kpartloader.nix
+++ b/pkgs/desktops/kde-4.5/sdk/kpartloader.nix
@@ -3,7 +3,6 @@
 kde.package {
   buildInputs = [ cmake kdelibs automoc4 ];
 
-  patches = [ ./optional-docs.diff ];
 
   meta = {
     description = "A test application for KParts";
@@ -11,7 +10,8 @@ kde.package {
       name = "kpartloader";
       module = "kdesdk";
       version = "1.0";
-      release = "4.5.1";
+      release = "4.5.2";
+      versionFile = "kpartloader.cpp";
     };
   };
 }