diff options
Diffstat (limited to 'pkgs/development/libraries')
-rw-r--r-- | pkgs/development/libraries/boost/default.nix | 7 | ||||
-rw-r--r-- | pkgs/development/libraries/gpgme/default.nix | 6 | ||||
-rw-r--r-- | pkgs/development/libraries/icu/default.nix | 14 | ||||
-rw-r--r-- | pkgs/development/libraries/libgpg-error/default.nix | 6 | ||||
-rw-r--r-- | pkgs/development/libraries/strigi/default.nix | 10 |
5 files changed, 31 insertions, 12 deletions
diff --git a/pkgs/development/libraries/boost/default.nix b/pkgs/development/libraries/boost/default.nix index a5172e31625..27c42ad7203 100644 --- a/pkgs/development/libraries/boost/default.nix +++ b/pkgs/development/libraries/boost/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{stdenv, fetchurl, icu, zlib, bzip2, python}: stdenv.mkDerivation { name = "boost-1.34.0"; @@ -6,4 +6,9 @@ stdenv.mkDerivation { url = http://kent.dl.sourceforge.net/sourceforge/boost/boost_1_34_0.tar.bz2; sha256 = "1lpganl8grvmy8rsbps5688yqiswvixjwz15d0kjfndp87xbhp25"; }; + buildInputs = [icu zlib bzip2 python]; + preConfigure=" + sed -e 's@^BJAM_CONFIG=\"\"@BJAM_CONFIG=\"--layout=system release threading=multi link=shared\"@g' -i configure + "; + configureFlags="--with-icu=${icu}"; } diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix index 1eff12646d3..68bbbc40904 100644 --- a/pkgs/development/libraries/gpgme/default.nix +++ b/pkgs/development/libraries/gpgme/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, libgpgerror, gnupg}: stdenv.mkDerivation { - name = "gpgme-1.0.3"; + name = "gpgme-1.1.4"; src = fetchurl { - url = http://nix.cs.uu.nl/dist/tarballs/gpgme-1.0.3.tar.gz; - md5 = "4d33cbdf844fcee1c724e4cf2a32dd11"; + url = ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-1.1.4.tar.bz2; + sha256 = "0ncrv7p33rjq1avkxpp9x0gz6wna9y3b3dmw6nv366n5mgvxmpg8"; }; buildInputs = [libgpgerror gnupg]; } diff --git a/pkgs/development/libraries/icu/default.nix b/pkgs/development/libraries/icu/default.nix new file mode 100644 index 00000000000..6a38d32eb33 --- /dev/null +++ b/pkgs/development/libraries/icu/default.nix @@ -0,0 +1,14 @@ +{stdenv, fetchurl}: + +stdenv.mkDerivation { + name = "icu4c-3.6"; + src = fetchurl { + url = ftp://ftp.software.ibm.com/software/globalization/icu/3.6/icu4c-3_6-src.tgz; + sha256 = "0hdh8sbpmabijprdpn7rmsqilw97f3paxxsxa4hd61k2kpbfhdai"; + }; + postUnpack=" + sourceRoot=\${sourceRoot}/source + echo Source root reset to \${sourceRoot} + "; + configureFlags="--disable-debug"; +} diff --git a/pkgs/development/libraries/libgpg-error/default.nix b/pkgs/development/libraries/libgpg-error/default.nix index ea37b987f03..c1f98d5c4b0 100644 --- a/pkgs/development/libraries/libgpg-error/default.nix +++ b/pkgs/development/libraries/libgpg-error/default.nix @@ -1,9 +1,9 @@ {stdenv, fetchurl}: stdenv.mkDerivation { - name = "libgpg-error-1.0"; + name = "libgpg-error-1.4"; src = fetchurl { - url = http://nix.cs.uu.nl/dist/tarballs/libgpg-error-1.0.tar.gz; - md5 = "ff409db977e4a4897aa09ea420a28a2f"; + url = ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-1.4.tar.gz; + sha256 = "06fn9rshrm7r49fkjc17xg39nz37kyda2l13qqgzjg69zz2pxxpz"; }; } diff --git a/pkgs/development/libraries/strigi/default.nix b/pkgs/development/libraries/strigi/default.nix index f6618bfae0d..85f21652b53 100644 --- a/pkgs/development/libraries/strigi/default.nix +++ b/pkgs/development/libraries/strigi/default.nix @@ -1,18 +1,18 @@ { stdenv, fetchurl, zlib, bzip2, expat, pkgconfig, cluceneCore, cluceneContrib, -qt, cmake, dbus, libxml2 }: +qt, cmake, dbus, libxml2, perl }: stdenv.mkDerivation { - name = "strigi-0.5.1"; + name = "strigi-0.5.3dev"; src = fetchurl { - url = ftp://ftp.chg.ru/pub/sourceforge/s/st/strigi/strigi-0.5.1.tar.bz2; - sha256 = "0n9ffqxdmz6ibki8rmac298z27937jddp7khmg2q8p15pnl5dq7i"; + url = http://repo.calcforge.org/f8/strigi-0.5.3.tar.bz2; + sha256 = "0rv7l2s4r022hrsw3jw0pvxh0yzlaw53jhmjxi3cbi6mdvc1y2sv"; }; patchPhase="sed -e 's/ iconv / /' -i ../cmake/FindIconv.cmake; export CLUCENE_HOME=${cluceneCore}"; buildInputs = [zlib cluceneCore cluceneContrib expat bzip2 pkgconfig qt cmake - stdenv.gcc.libc dbus libxml2]; + stdenv.gcc.libc dbus libxml2 perl]; meta = { description = "Strigi is a fast and light desktop search engine"; |