Author: urkud
Date: Tue Feb 22 11:54:49 2011
New Revision: 26057
URL: https://svn.nixos.org/websvn/nix/?rev=26057&sc=1
Log:
Move strigi outside of kde-4.x
Added:
nixpkgs/trunk/pkgs/development/libraries/strigi/
nixpkgs/trunk/pkgs/development/libraries/strigi/default.nix
- copied, changed from r26056,
nixpkgs/trunk/pkgs/desktops/kde-4.5/support/strigi/default.nix
Deleted:
nixpkgs/trunk/pkgs/desktops/kde-4.5/support/strigi/
nixpkgs/trunk/pkgs/desktops/kde-4.6/support/strigi/
Modified:
nixpkgs/trunk/pkgs/desktops/kde-4.5/default.nix
nixpkgs/trunk/pkgs/desktops/kde-4.6/default.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified: nixpkgs/trunk/pkgs/desktops/kde-4.5/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/desktops/kde-4.5/default.nix Tue Feb 22 11:54:42
2011 (r26056)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.5/default.nix Tue Feb 22 11:54:49
2011 (r26057)
@@ -39,8 +39,6 @@
polkit_qt_1 = callPackage ./support/polkit-qt-1 { };
- strigi = callPackage ./support/strigi { };
-
soprano = callPackage ./support/soprano { };
### LIBS
Modified: nixpkgs/trunk/pkgs/desktops/kde-4.6/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/desktops/kde-4.6/default.nix Tue Feb 22 11:54:42
2011 (r26056)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.6/default.nix Tue Feb 22 11:54:49
2011 (r26057)
@@ -38,8 +38,6 @@
polkit_qt_1 = callPackage ./support/polkit-qt-1 { };
- strigi = callPackage ./support/strigi { };
-
soprano = callPackage ./support/soprano { };
### LIBS
Copied and modified:
nixpkgs/trunk/pkgs/development/libraries/strigi/default.nix (from r26056,
nixpkgs/trunk/pkgs/desktops/kde-4.5/support/strigi/default.nix)
==============================================================================
--- nixpkgs/trunk/pkgs/desktops/kde-4.5/support/strigi/default.nix Tue Feb
22 11:54:42 2011 (r26056, copy source)
+++ nixpkgs/trunk/pkgs/development/libraries/strigi/default.nix Tue Feb 22
11:54:49 2011 (r26057)
@@ -11,9 +11,9 @@
sha256 = "1f1ac27cjm5m4iwsgvd7nylr0md0a95przkbpsdq7l90wjxj390w";
};
includeAllQtDirs=true;
-
+
CLUCENE_HOME = cluceneCore;
-
+
# Dependencies such as SQLite and FAM are unreliable in this release
buildInputs = [
cmake perl qt4 bzip2 stdenv.gcc.libc libxml2 expat exiv2 cluceneCore
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Tue Feb 22 11:54:42
2011 (r26056)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Tue Feb 22 11:54:49
2011 (r26057)
@@ -4111,6 +4111,8 @@
stlport = callPackage ../development/libraries/stlport { };
+ strigi = callPackage ../development/libraries/strigi {};
+
suitesparse = callPackage ../development/libraries/suitesparse { };
sword = callPackage ../development/libraries/sword { };
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
