Merging from trunk.

I hope I resolved the conflicts well (gmp and gccCross)


svn path=/nixpkgs/branches/stdenv-updates/; revision=21251

1 files changed, 26 insertions, 0 deletions

diff --git a/pkgs/os-specific/linux/wvdial/default.nix b/pkgs/os-specific/linux/wvdial/default.nix
new file mode 100644
index 00000000000..bc88d56ae31
--- /dev/null
+++ b/pkgs/os-specific/linux/wvdial/default.nix
@@ -0,0 +1,26 @@
+args: with args;
+stdenv.mkDerivation {
+  name = "wvdial-1.16";
+
+  src = fetchurl {
+    url = http://wvstreams.googlecode.com/files/wvdial-1.61.tar.gz;
+    sha256 = "0mzcrv8mc60gbdrixc9k8ammbslvjb9x2cs50yf1jq67aabapzsg";
+  };
+
+  buildInputs = [wvstreams pkgconfig];
+
+  preConfigure = ''
+    find -type f | xargs sed -i 's@/bin/bash@bash@g'
+    export makeFlags="prefix=$out"
+    # not sure about this line
+    sed -i 's@/etc/ppp/peers@$out/etc/ppp/peers@' Makefile.in
+  '';
+
+  meta = {
+    description = "dialer automatically recognizing the modem";
+    homepage = http://alumnit.ca/wiki/index.php?page=WvDial;
+    license = "LGPL";
+    maintainers = [stdenv.lib.maintainers.marcweber];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}