From 0b15fe76ab90fc62f1ef047fb6ca2b6d3c634d07 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Mon, 28 Jan 2008 19:49:59 +0000 Subject: [PATCH] mc nix-expr review svn path=/nixpkgs/trunk/; revision=10361 --- pkgs/tools/misc/mc/builder.sh | 7 ------- pkgs/tools/misc/mc/default.nix | 15 ++++++++++----- 2 files changed, 10 insertions(+), 12 deletions(-) delete mode 100644 pkgs/tools/misc/mc/builder.sh diff --git a/pkgs/tools/misc/mc/builder.sh b/pkgs/tools/misc/mc/builder.sh deleted file mode 100644 index 28b5d68b55aa..000000000000 --- a/pkgs/tools/misc/mc/builder.sh +++ /dev/null @@ -1,7 +0,0 @@ -source $stdenv/setup - -tar xfvz $src -cd mc-* -./configure --prefix=$out --with-screen=ncurses -make -make install diff --git a/pkgs/tools/misc/mc/default.nix b/pkgs/tools/misc/mc/default.nix index 9400cbbf4436..5a9e994b4dfc 100644 --- a/pkgs/tools/misc/mc/default.nix +++ b/pkgs/tools/misc/mc/default.nix @@ -1,11 +1,16 @@ -{stdenv, fetchurl, pkgconfig, glib, ncurses, libX11}: +args: with args; -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "mc-4.6.1"; src = fetchurl { - url = http://www.ibiblio.org/pub/Linux/utils/file/managers/mc/mc-4.6.1.tar.gz; - md5 = "18b20db6e40480a53bac2870c56fc3c4"; + url = "http://www.ibiblio.org/pub/Linux/utils/file/managers/mc/${name}.tar.gz"; + sha256 = "0zly25mwdn84s0wqx9mzyqi177mm828716nv1n6a4a5cm8yv0sh8"; }; buildInputs = [pkgconfig glib ncurses libX11]; - builder = ./builder.sh; + configureFlags = "--with-screen=ncurses"; + meta = { + description = "File Manager and User Shell for the GNU Project"; + homepage = http://www.ibiblio.org/mc; + }; } +