diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2007-06-20 13:01:59 +0000 |
|---|---|---|
| committer | Michael Raskin <7c6f434c@mail.ru> | 2007-06-20 13:01:59 +0000 |
| commit | f8db720230bd460c1744bb7f8bf718f704bcc6b3 (patch) | |
| tree | 03f198254751e96a70e54e2d4d64f26e6a542434 /pkgs/os-specific/linux/iproute | |
| parent | 56b2d0eb9ed47742d080539b204902c54534fa77 (diff) | |
Refreshed iproute package.
svn path=/nixpkgs/trunk/; revision=8906
Diffstat (limited to 'pkgs/os-specific/linux/iproute')
| -rw-r--r-- | pkgs/os-specific/linux/iproute/default.nix | 20 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/iproute/iproute2-2.6.15-060110-path.patch | 17 |
2 files changed, 12 insertions, 25 deletions
diff --git a/pkgs/os-specific/linux/iproute/default.nix b/pkgs/os-specific/linux/iproute/default.nix index da0db8316b9ab..5707100f0f0ab 100644 --- a/pkgs/os-specific/linux/iproute/default.nix +++ b/pkgs/os-specific/linux/iproute/default.nix @@ -1,12 +1,16 @@ -{stdenv, fetchurl, bison, flex, db4}: -stdenv.mkDerivation { - name = "iproute2-2.6.15-060110"; - src = fetchurl { - url = http://nix.cs.uu.nl/dist/tarballs/iproute2-2.6.15-060110.tar.gz; - md5 = "04f57a6d366d36426d276178b600f5c5"; +pkgs: +pkgs.stdenv.mkDerivation { + name = "iproute"; + + src = pkgs.fetchurl { + url = http://ftp.debian.org/debian/pool/main/i/iproute/iproute_20070313.orig.tar.gz; + sha256 = "1j7cmlr7p9xcg9ys8fhjnynwrp475rbkr2j2c5jqm1xzczw60f9v"; }; - buildInputs = [bison flex db4]; - patches = [./iproute2-2.6.15-060110-path.patch]; + preConfigure = "for script in $(find . -type f); do sed -e 's@#! /bin/bash@#! /bin/sh@' -i $script; done;"; + + makeFlags = " SBINDIR=\\$(out)/sbin CONFDIR=\\$(out)/etc DOCDIR=\\$(out)/doc MANDIR=\\$(out)/man "; + + buildInputs = [pkgs.bison pkgs.flex pkgs.db4]; } diff --git a/pkgs/os-specific/linux/iproute/iproute2-2.6.15-060110-path.patch b/pkgs/os-specific/linux/iproute/iproute2-2.6.15-060110-path.patch deleted file mode 100644 index 8bf0bd265419e..0000000000000 --- a/pkgs/os-specific/linux/iproute/iproute2-2.6.15-060110-path.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -ruN iproute2-2.6.15-060110/Makefile iproute2-2.6.15-060110.new/Makefile ---- iproute2-2.6.15-060110/Makefile 2005-07-08 22:08:47.000000000 +0000 -+++ iproute2-2.6.15-060110.new/Makefile 2006-02-16 17:03:31.000000000 +0000 -@@ -1,11 +1,11 @@ --DESTDIR= -+DESTDIR=$(out) - SBINDIR=/usr/sbin - CONFDIR=/etc/iproute2 - DOCDIR=/usr/share/doc/iproute2 - MANDIR=/usr/share/man - - # Path to db_185.h include --DBM_INCLUDE:=/usr/include -+#DBM_INCLUDE:=/usr/include - - DEFINES= -DRESOLVE_HOSTNAMES - |