diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2009-01-03 15:13:19 +0000 |
|---|---|---|
| committer | Michael Raskin <7c6f434c@mail.ru> | 2009-01-03 15:13:19 +0000 |
| commit | 4c78e32aba5ffad2901b7cfba57c99778ea71c47 (patch) | |
| tree | 3e5144c93a9d451081d39112771300575ae11f96 /pkgs/os-specific/linux/iproute | |
| parent | b04fc9492c4526a2d95f24ca729a517c44e73b40 (diff) | |
| download | nixpkgs-4c78e32aba5ffad2901b7cfba57c99778ea71c47.tar nixpkgs-4c78e32aba5ffad2901b7cfba57c99778ea71c47.tar.gz nixpkgs-4c78e32aba5ffad2901b7cfba57c99778ea71c47.tar.bz2 nixpkgs-4c78e32aba5ffad2901b7cfba57c99778ea71c47.tar.lz nixpkgs-4c78e32aba5ffad2901b7cfba57c99778ea71c47.tar.xz nixpkgs-4c78e32aba5ffad2901b7cfba57c99778ea71c47.tar.zst nixpkgs-4c78e32aba5ffad2901b7cfba57c99778ea71c47.zip | |
Updating iproute - patch by Lluis Batlle
svn path=/nixpkgs/trunk/; revision=13696
Diffstat (limited to 'pkgs/os-specific/linux/iproute')
| -rw-r--r-- | pkgs/os-specific/linux/iproute/default.nix | 27 |
1 files changed, 18 insertions, 9 deletions
diff --git a/pkgs/os-specific/linux/iproute/default.nix b/pkgs/os-specific/linux/iproute/default.nix index ef277b5e06e..cf0b735c752 100644 --- a/pkgs/os-specific/linux/iproute/default.nix +++ b/pkgs/os-specific/linux/iproute/default.nix @@ -1,16 +1,25 @@ +{fetchurl, stdenv, flex, bison, db4}: -pkgs: -pkgs.stdenv.mkDerivation { - name = "iproute-20070313"; +stdenv.mkDerivation { + name = "iproute-2.6.22-070710"; - src = pkgs.fetchurl { - url = http://ftp.debian.org/debian/pool/main/i/iproute/iproute_20070313.orig.tar.gz; - sha256 = "1j7cmlr7p9xcg9ys8fhjnynwrp475rbkr2j2c5jqm1xzczw60f9v"; + src = fetchurl { + url = http://developer.osdl.org/dev/iproute2/download/iproute2-2.6.22-070710.tar.gz; + sha256 = "3c6b48af9e655e4f0a34c7718e288960a1dc84a3ac7eb726e855adb45fbd953a"; }; + + unpackPhase = '' + mkdir tmp; cd tmp + unpackFile "$src" + ''; - preConfigure = "for script in $(find . -type f); do sed -e 's@#! /bin/bash@#! /bin/sh@' -i $script; done;"; + patchPhase = '' + for script in $(find . -type f); do sed -e 's@#! /bin/bash@#! /bin/sh@' -i $script; + done; + sed -e s@/usr/lib@$out/lib@ -i tc/Makefile + ''; makeFlags = " SBINDIR=\\$(out)/sbin CONFDIR=\\$(out)/etc DOCDIR=\\$(out)/doc MANDIR=\\$(out)/man "; - - buildInputs = [pkgs.bison pkgs.flex pkgs.db4]; + + buildInputs = [bison flex db4]; } |