Author: egorochkin Date: 2010-06-19 21:35:18 +0000 (Sat, 19 Jun 2010) New Revision: 22337
You can view the changes in this commit at: https://svn.nixos.org/viewvc/nix?rev=22337&view=rev Modified: nixpkgs/trunk/pkgs/desktops/kde-4.4/base-runtime/default.nix nixpkgs/trunk/pkgs/desktops/kde-4.4/default.nix Log: Make Nepomuk work Changes: Modified: nixpkgs/trunk/pkgs/desktops/kde-4.4/base-runtime/default.nix =================================================================== --- nixpkgs/trunk/pkgs/desktops/kde-4.4/base-runtime/default.nix 2010-06-19 15:52:28 UTC (rev 22336) +++ nixpkgs/trunk/pkgs/desktops/kde-4.4/base-runtime/default.nix 2010-06-19 21:35:18 UTC (rev 22337) @@ -1,5 +1,5 @@ { stdenv, fetchurl, lib, cmake, perl, bzip2, xz, qt4, alsaLib, xineLib, samba, shared_mime_info, exiv2, libssh -, kdelibs, automoc4, phonon, strigi, soprano, cluceneCore, attica}: +, kdelibs, automoc4, phonon, strigi, soprano, cluceneCore, attica, virtuoso, makeWrapper }: stdenv.mkDerivation { name = "kdebase-runtime-4.4.4"; @@ -7,10 +7,16 @@ url = mirror://kde/stable/4.4.4/src/kdebase-runtime-4.4.4.tar.bz2; sha256 = "1gxa05i6zvklxng6ak5vak05dyay8j8g2hmdhma2290lwgf8gbx8"; }; + /* CLUCENE_HOME=cluceneCore;*/ - # Still have to look into Soprano Virtuoso buildInputs = [ cmake perl bzip2 xz qt4 alsaLib xineLib samba stdenv.gcc.libc shared_mime_info exiv2 libssh - kdelibs automoc4 phonon strigi soprano cluceneCore attica ]; + kdelibs automoc4 phonon strigi soprano cluceneCore attica makeWrapper]; + + postInstall = '' + wrapProgram "$out/bin/nepomukservicestub" --prefix LD_LIBRARY_PATH : "${virtuoso}/lib" \ + --prefix PATH : "${virtuoso}/bin" + ''; + meta = { description = "KDE runtime"; longDescription = "Libraries and tools which supports running KDE desktop applications"; Modified: nixpkgs/trunk/pkgs/desktops/kde-4.4/default.nix =================================================================== --- nixpkgs/trunk/pkgs/desktops/kde-4.4/default.nix 2010-06-19 15:52:28 UTC (rev 22336) +++ nixpkgs/trunk/pkgs/desktops/kde-4.4/default.nix 2010-06-19 21:35:18 UTC (rev 22337) @@ -83,8 +83,8 @@ }; kdebase_runtime = import ./base-runtime { - inherit (pkgs) stdenv fetchurl lib cmake perl bzip2 xz qt4 exiv2 libssh; - inherit (pkgs) shared_mime_info xineLib alsaLib samba cluceneCore; + inherit (pkgs) stdenv fetchurl lib cmake perl bzip2 xz qt4 exiv2 libssh makeWrapper; + inherit (pkgs) shared_mime_info xineLib alsaLib samba cluceneCore virtuoso; inherit kdelibs attica; inherit automoc4 phonon strigi soprano; }; _______________________________________________ nix-commits mailing list [email protected] http://mail.cs.uu.nl/mailman/listinfo/nix-commits
