From 08b7947416c3755ce845092fdffdc49f004cf878 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Wed, 16 Sep 2009 17:26:19 +0000 Subject: [PATCH] Enabled support for X11 events in midnight commander svn path=/nixpkgs/trunk/; revision=17208 --- pkgs/tools/misc/mc/default.nix | 8 +++++--- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/mc/default.nix b/pkgs/tools/misc/mc/default.nix index 44f042bd419..1773056481f 100644 --- a/pkgs/tools/misc/mc/default.nix +++ b/pkgs/tools/misc/mc/default.nix @@ -1,4 +1,5 @@ -{stdenv, fetchurl, lib, pkgconfig, glib, ncurses, libX11, shebangfix, perl, zip, unzip, gettext, slang}: +{ stdenv, fetchurl, lib, pkgconfig, glib, ncurses +, libX11, libXt, shebangfix, perl, zip, unzip, gettext, slang}: stdenv.mkDerivation rec { name = "mc-4.6.1"; @@ -6,7 +7,7 @@ stdenv.mkDerivation rec { url = "http://www.ibiblio.org/pub/Linux/utils/file/managers/mc/${name}.tar.gz"; sha256 = "0zly25mwdn84s0wqx9mzyqi177mm828716nv1n6a4a5cm8yv0sh8"; }; - buildInputs = [pkgconfig glib ncurses libX11 shebangfix perl zip unzip slang gettext]; + buildInputs = [pkgconfig glib ncurses libX11 libXt shebangfix perl zip unzip slang gettext]; configureFlags = "--enable-charset"; # Stole some patches from LFS which fix some nasty bugs @@ -43,7 +44,8 @@ stdenv.mkDerivation rec { iconv -f KOI8-U -t UTF-8 lib/mc.hint.uk > lib/mc.hint.uk.utf8 && mv lib/mc.hint.uk.utf8 lib/mc.hint.uk && iconv -f BIG5 -t UTF-8 lib/mc.hint.zh > lib/mc.hint.zh.utf8 && - mv lib/mc.hint.zh.utf8 lib/mc.hint.zh + mv lib/mc.hint.zh.utf8 lib/mc.hint.zh + # foo ''; makeFlags = "UNZIP=unzip"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c93ea90b34c..476f12bcee9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1014,7 +1014,7 @@ let mc = import ../tools/misc/mc { inherit fetchurl stdenv lib pkgconfig ncurses shebangfix perl zip unzip slang gettext; inherit (gtkLibs) glib; - inherit (xlibs) libX11; + inherit (xlibs) libX11 libXt; }; mcabber = import ../applications/networking/instant-messengers/mcabber {