From 84649f53032ed6b17458ac856660990d29ce3a93 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 17 Jun 2007 22:44:30 +0000 Subject: [PATCH] Added lsof in package collection svn path=/nixpkgs/trunk/; revision=8886 --- pkgs/development/tools/misc/lsof/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 7 ++++++- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/misc/lsof/default.nix b/pkgs/development/tools/misc/lsof/default.nix index 012f5259c5c..19be6773c84 100644 --- a/pkgs/development/tools/misc/lsof/default.nix +++ b/pkgs/development/tools/misc/lsof/default.nix @@ -1,9 +1,9 @@ -pkgs: -pkgs.stdenv.mkDerivation { +{stdenv, fetchurl}: +stdenv.mkDerivation { name = "lsof"; - src = pkgs.fetchurl { + src = fetchurl { url = ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/lsof_4.78.tar.bz2; sha256 = "0azvl43niqkq94drx52p6dvp70r38f25fqw181ywmvqn80dbb3c9"; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f3fac78026f..faec5faf0fe 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1082,6 +1082,10 @@ rec { inherit fetchurl stdenv perl m4; }; + lsof = import ../development/tools/misc/lsof { + inherit fetchurl stdenv; + }; + mk = import ../development/tools/build-managers/mk { inherit fetchurl stdenv; }; @@ -2170,7 +2174,8 @@ rec { }; vsftpd = import ../servers/ftp/vsftpd { - inherit fetchurl stdenv openssl ; + inherit fetchurl openssl ; + stdenv = overrideGCC stdenv gcc295 ; }; xorg = recurseIntoAttrs (import ../servers/x11/xorg {