diff options
Diffstat (limited to 'pkgs/development/libraries')
14 files changed, 55 insertions, 85 deletions
diff --git a/pkgs/development/libraries/enchant/1.3.0.nix b/pkgs/development/libraries/enchant/default.nix index 0e3f92881e90..388d042d3aca 100644 --- a/pkgs/development/libraries/enchant/1.3.0.nix +++ b/pkgs/development/libraries/enchant/default.nix @@ -1,10 +1,10 @@ -args: with args; +{ stdenv, fetchurl, aspell, pkgconfig, glib }: stdenv.mkDerivation rec { - name = "enchant-" + version; + name = "enchant-1.3.0"; src = fetchurl { - url = "http://www.abisource.com/downloads/enchant/${version}/${name}.tar.gz"; + url = "http://www.abisource.com/downloads/enchant/1.3.0/${name}.tar.gz"; sha256 = "1vwqwsadnp4rf8wj7d4rglvszjzlcli0jyxh06h8inka1sm1al76"; }; diff --git a/pkgs/development/libraries/libdbi-drivers/0.8.2-1.nix b/pkgs/development/libraries/libdbi-drivers/0.8.2-1.nix index add438d07f1a..bb146a5cddff 100644 --- a/pkgs/development/libraries/libdbi-drivers/0.8.2-1.nix +++ b/pkgs/development/libraries/libdbi-drivers/0.8.2-1.nix @@ -29,7 +29,7 @@ args : with args; }; in with localDefs; stdenv.mkDerivation rec { - name = "libdbi-"+version; + name = "libdbi-0.8.2-1"; builder = writeScript (name + "-builder") (textClosure localDefs [doConfigure doMakeInstall doForceShare doPropagate]); meta = { diff --git a/pkgs/development/libraries/libdbi/0.8.2.nix b/pkgs/development/libraries/libdbi/0.8.2.nix index dd0f2ec1c5f9..b908c76fa78c 100644 --- a/pkgs/development/libraries/libdbi/0.8.2.nix +++ b/pkgs/development/libraries/libdbi/0.8.2.nix @@ -11,7 +11,7 @@ args : with args; }; in with localDefs; stdenv.mkDerivation rec { - name = "libdbi-"+version; + name = "libdbi-0.8.2"; builder = writeScript (name + "-builder") (textClosure localDefs [doConfigure doMakeInstall doForceShare doPropagate]); meta = { diff --git a/pkgs/development/libraries/libextractor/0.5.18.nix b/pkgs/development/libraries/libextractor/0.5.18.nix index ed56e5ce4feb..557369bd76c7 100644 --- a/pkgs/development/libraries/libextractor/0.5.18.nix +++ b/pkgs/development/libraries/libextractor/0.5.18.nix @@ -11,7 +11,7 @@ args : with args; }; in with localDefs; stdenv.mkDerivation rec { - name = "libextractor-"+version; + name = "libextractor-0.5.18"; builder = writeScript (name + "-builder") (textClosure localDefs [doConfigure doMakeInstall doForceShare doPropagate]); meta = { diff --git a/pkgs/development/libraries/libjingle/0.3.11.nix b/pkgs/development/libraries/libjingle/0.3.11.nix index b9d0b82df5eb..3fa8c99c4304 100644 --- a/pkgs/development/libraries/libjingle/0.3.11.nix +++ b/pkgs/development/libraries/libjingle/0.3.11.nix @@ -1,10 +1,12 @@ -args: with args; +{ stdenv, fetchurl, mediastreamer }: + stdenv.mkDerivation rec { - name = "libjingle-" + version; - src = fetchurl { - url = "mirror://sf/tapioca-voip/${name}.tar.gz"; - sha256 = "1x5l2jwxpkyxvnq0cagq40p6x61v23vxngnnsxr15lyh1zwzk1yj"; - }; + name = "libjingle-0.3.11"; + + src = fetchurl { + url = "mirror://sourceforge/tapioca-voip/${name}.tar.gz"; + sha256 = "1x5l2jwxpkyxvnq0cagq40p6x61v23vxngnnsxr15lyh1zwzk1yj"; + }; propagatedBuildInputs = [ mediastreamer ]; } diff --git a/pkgs/development/libraries/mediastreamer/2.2.0-cvs20080207.nix b/pkgs/development/libraries/mediastreamer/2.2.0-cvs20080207.nix index 0d2cefee200b..2b4a6a35f832 100644 --- a/pkgs/development/libraries/mediastreamer/2.2.0-cvs20080207.nix +++ b/pkgs/development/libraries/mediastreamer/2.2.0-cvs20080207.nix @@ -1,7 +1,8 @@ -args: with args; +{ stdenv, fetchurl, autoconf, automake, libtool +, pkgconfig, alsaLib, ffmpeg, speex, ortp }: stdenv.mkDerivation rec { - name = "mediastreamer2-" + version; + name = "mediastreamer2-2.2.0-cvs20080207"; # This url is not related to mediastreamer. fetchcvs doesn't work on my laptop, # so I've created cvs snapshot and put it to my server. diff --git a/pkgs/development/libraries/msilbc/2.0.0.nix b/pkgs/development/libraries/msilbc/default.nix index 8bc8f2a6c1db..2978f0808c18 100644 --- a/pkgs/development/libraries/msilbc/2.0.0.nix +++ b/pkgs/development/libraries/msilbc/default.nix @@ -1,6 +1,8 @@ -args: with args; +{ stdenv, fetchurl, ilbc, mediastreamer, pkgconfig }: + stdenv.mkDerivation rec { - name = "msilbc-" + version; + name = "msilbc-2.0.0"; + src = fetchurl { url = "http://download.savannah.gnu.org/releases/linphone/plugins/sources/${name}.tar.gz"; sha256 = "0ifydb7qmpync56l4hbrp36n5wrb7gadb76isp643s6wsg7l743j"; @@ -9,6 +11,7 @@ stdenv.mkDerivation rec { patchPhase = "sed -i /MS_FILTER_SET_FMTP/d ilbc.c"; propagatedBuildInputs = [ilbc mediastreamer]; + buildInputs = [pkgconfig]; buildPhase = '' @@ -17,8 +20,8 @@ stdenv.mkDerivation rec { cc `pkg-config --libs mediastreamer` -shared -pthread -o libilbc.so ''; - installPhase = " - ensureDir \${out}/lib/mediastreamer/plugins - cp libilbc.so \${out}/lib/mediastreamer/plugins - "; + installPhase = '' + ensureDir $out/lib/mediastreamer/plugins + cp libilbc.so $out/lib/mediastreamer/plugins + ''; } diff --git a/pkgs/development/libraries/redland/1.0.8.nix b/pkgs/development/libraries/redland/1.0.8.nix index 9b065043178a..f0c2300b1693 100644 --- a/pkgs/development/libraries/redland/1.0.8.nix +++ b/pkgs/development/libraries/redland/1.0.8.nix @@ -1,10 +1,7 @@ args: with args; -let name = "redland-${version}"; -in - -stdenv.mkDerivation { - inherit name; +stdenv.mkDerivation rec { + name = "redland-1.0.8"; src = fetchurl { url = "mirror://sf/librdf/${name}.tar.gz"; diff --git a/pkgs/development/libraries/redland/1.0.9.nix b/pkgs/development/libraries/redland/1.0.9.nix index 93606ad0eb58..231e64a00aee 100644 --- a/pkgs/development/libraries/redland/1.0.9.nix +++ b/pkgs/development/libraries/redland/1.0.9.nix @@ -1,10 +1,7 @@ args: with args; -let name = "redland-${version}"; -in - -stdenv.mkDerivation { - inherit name; +stdenv.mkDerivation rec { + name = "redland-1.0.9"; src = fetchurl { url = "mirror://sf/librdf/${name}.tar.gz"; @@ -21,13 +18,13 @@ stdenv.mkDerivation { configureFlags = "--with-threads --with-bdb=${bdb}"; patchPhase = - '' - sed -e 1s@/usr@${perl}@ -i utils/touch-mtime.pl - - # Redland 1.0.9 uses an internal pre-processor symbol SQLITE_API - # that collides with a symbol of the same name in sqlite 3.6.19. - # This is a quick fix for the problem. A real solution needs to be - # implemented upstream, though. - find . -type f -exec sed -i -e 's/SQLITE_API/REDLAND_SQLITE_API/g' {} \; - ''; + '' + sed -e 1s@/usr@${perl}@ -i utils/touch-mtime.pl + + # Redland 1.0.9 uses an internal pre-processor symbol SQLITE_API + # that collides with a symbol of the same name in sqlite 3.6.19. + # This is a quick fix for the problem. A real solution needs to be + # implemented upstream, though. + find . -type f -exec sed -i -e 's/SQLITE_API/REDLAND_SQLITE_API/g' {} \; + ''; } diff --git a/pkgs/development/libraries/tk/8.4.16.nix b/pkgs/development/libraries/tk/8.4.16.nix deleted file mode 100644 index 38b7ec857495..000000000000 --- a/pkgs/development/libraries/tk/8.4.16.nix +++ /dev/null @@ -1,18 +0,0 @@ -args: with args; - -stdenv.mkDerivation { - name = "tk-${version}"; - src = fetchurl { - url = "mirror://sourceforge/tcl/tk${version}-src.tar.gz"; - sha256 = "0cciavzd05bpm5yfppid0s0vsf8kabwia9620vgvi26sv1gjgwhb"; - }; - postInstall = '' - echo -e '#! /bin/sh \n $( readlink -f $( type -tP wish${builtins.substring 0 3 version}) ) "$@"' >$out/bin/wish - chmod a+x $out/bin/wish - ''; - configureFlags="--with-tcl=${tcl}/lib"; - preConfigure = "cd unix"; - - buildInputs = [tcl x11]; - inherit tcl; -} diff --git a/pkgs/development/libraries/tk/8.4.18.nix b/pkgs/development/libraries/tk/8.4.18.nix deleted file mode 100644 index f09303ade459..000000000000 --- a/pkgs/development/libraries/tk/8.4.18.nix +++ /dev/null @@ -1,18 +0,0 @@ -args: with args; - -stdenv.mkDerivation { - name = "tk-${version}"; - src = fetchurl { - url = "mirror://sourceforge/tcl/tk${version}-src.tar.gz"; - sha256 = "065cbs82a8nklmj4867744skb3l3mqv14s8jwribk2wazzdb0mqp"; - }; - postInstall = '' - echo -e '#! /bin/sh \n $( readlink -f $( type -tP wish${__substring 0 3 version}) ) "$@"' >$out/bin/wish - chmod a+x $out/bin/wish - ''; - configureFlags="--with-tcl=${tcl}/lib"; - preConfigure = "cd unix"; - - buildInputs = [tcl x11]; - inherit tcl; -} diff --git a/pkgs/development/libraries/tk/8.5.7.nix b/pkgs/development/libraries/tk/8.5.7.nix index 56a757c8c7c8..bf6da7b65982 100644 --- a/pkgs/development/libraries/tk/8.5.7.nix +++ b/pkgs/development/libraries/tk/8.5.7.nix @@ -1,17 +1,22 @@ -args: with args; +{ stdenv, fetchurl, tcl, x11 }: stdenv.mkDerivation { - name = "tk-${version}"; + name = "tk-8.5.7"; + src = fetchurl { - url = "mirror://sourceforge/tcl/tk${version}-src.tar.gz"; + url = "mirror://sourceforge/tcl/tk8.5.7-src.tar.gz"; sha256 = "0c5gsy3nlwl0wn9swz4k4v7phy7nzjl317gca1jykgf4jz9nwdnr"; }; + postInstall = '' ln -s $out/bin/wish* $out/bin/wish ''; - configureFlags="--with-tcl=${tcl}/lib"; + + configureFlags = "--with-tcl=${tcl}/lib"; + preConfigure = "cd unix"; buildInputs = [tcl x11]; + inherit tcl; } diff --git a/pkgs/development/libraries/xapian/bindings/1.0.14.nix b/pkgs/development/libraries/xapian/bindings/1.0.14.nix index 9761c6834474..28eacd4e4e41 100644 --- a/pkgs/development/libraries/xapian/bindings/1.0.14.nix +++ b/pkgs/development/libraries/xapian/bindings/1.0.14.nix @@ -3,7 +3,7 @@ args: with args; let inherit (args.composableDerivation) composableDerivation wwf; in composableDerivation {} { - name = "xapian-bindings-${version}"; + name = "xapian-bindings-1.0.14"; src = fetchurl { url = http://oligarchy.co.uk/xapian/1.0.14/xapian-bindings-1.0.14.tar.gz; diff --git a/pkgs/development/libraries/xapian/1.0.14.nix b/pkgs/development/libraries/xapian/default.nix index b4ce74640ea0..6b2966ee7e25 100644 --- a/pkgs/development/libraries/xapian/1.0.14.nix +++ b/pkgs/development/libraries/xapian/default.nix @@ -1,6 +1,7 @@ -args: with args; +{ stdenv, fetchurl, zlib }: + stdenv.mkDerivation { - name = "xapian-${version}"; + name = "xapian-1.0.14"; src = fetchurl { url = http://oligarchy.co.uk/xapian/1.0.14/xapian-core-1.0.14.tar.gz; @@ -10,8 +11,8 @@ stdenv.mkDerivation { buildInputs = [zlib]; meta = { - description = "Xapian Probabilistic Information Retrieval library"; - homepage = "http://xapian.org"; - license = "GPLv2"; + description = "Xapian Probabilistic Information Retrieval library"; + homepage = "http://xapian.org"; + license = "GPLv2"; }; } |