diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2005-10-04 14:24:19 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2005-10-04 14:24:19 +0000 |
| commit | bdabd66a464f87e7f4ab4d2aea9ab36944cf4510 (patch) | |
| tree | db39976f8b0b811cc2e766ad4270858e53be7fe9 /pkgs/os-specific/linux/procps | |
| parent | 5573610e012a4666117851e12c7e8eb4e5aa00c1 (diff) | |
| download | nixpkgs-bdabd66a464f87e7f4ab4d2aea9ab36944cf4510.tar nixpkgs-bdabd66a464f87e7f4ab4d2aea9ab36944cf4510.tar.gz nixpkgs-bdabd66a464f87e7f4ab4d2aea9ab36944cf4510.tar.bz2 nixpkgs-bdabd66a464f87e7f4ab4d2aea9ab36944cf4510.tar.lz nixpkgs-bdabd66a464f87e7f4ab4d2aea9ab36944cf4510.tar.xz nixpkgs-bdabd66a464f87e7f4ab4d2aea9ab36944cf4510.tar.zst nixpkgs-bdabd66a464f87e7f4ab4d2aea9ab36944cf4510.zip | |
* Install ncurses header files in $out/include, not
$out/include/ncurses. This simplifies many builders. svn path=/nixpkgs/trunk/; revision=4008
Diffstat (limited to 'pkgs/os-specific/linux/procps')
| -rw-r--r-- | pkgs/os-specific/linux/procps/builder.sh | 2 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/procps/default.nix | 7 |
2 files changed, 3 insertions, 6 deletions
diff --git a/pkgs/os-specific/linux/procps/builder.sh b/pkgs/os-specific/linux/procps/builder.sh index aef3df8f5be..9351c6c557d 100644 --- a/pkgs/os-specific/linux/procps/builder.sh +++ b/pkgs/os-specific/linux/procps/builder.sh @@ -1,7 +1,5 @@ . $stdenv/setup -export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$ncurses/include/ncurses" - export DESTDIR=$out genericBuild diff --git a/pkgs/os-specific/linux/procps/default.nix b/pkgs/os-specific/linux/procps/default.nix index a211bdde454..a5be0ca1a2f 100644 --- a/pkgs/os-specific/linux/procps/default.nix +++ b/pkgs/os-specific/linux/procps/default.nix @@ -1,13 +1,12 @@ {stdenv, fetchurl, ncurses}: stdenv.mkDerivation { - name = "procps-3.2.4"; + name = "procps-3.2.5"; builder = ./builder.sh; src = fetchurl { - url = http://nix.cs.uu.nl/dist/tarballs/procps-3.2.4.tar.gz; - md5 = "1bec6740b385b3f73800827437f14f85"; + url = http://procps.sourceforge.net/procps-3.2.5.tar.gz; + md5 = "cde0e3612d1d7c68f404d46f01c44fb4"; }; patches = [./makefile.patch]; buildInputs = [ncurses]; - inherit ncurses; } |