JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Fixed slang so that it always finds the terminfo files

Browse Source 
- Added GPM support to midnight commander


svn path=/nixpkgs/trunk/; revision=17209
This commit is contained in:
Sander van der Burg 2009-09-16 17:52:54 +00:00
parent 08b7947416
commit b25e2987a6
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/libraries/slang/default.nix
View File

@ -6,8 +6,10 @@ stdenv.mkDerivation {
url = ftp://ftp.fu-berlin.de/pub/unix/misc/slang/v2.2/slang-2.2.1.tar.bz2; url = ftp://ftp.fu-berlin.de/pub/unix/misc/slang/v2.2/slang-2.2.1.tar.bz2;
sha256 = "1qgfg6i5lzmw8j9aqd8pgz3vnhn80giij9bpgm5r3gmna2h0rzfj"; sha256 = "1qgfg6i5lzmw8j9aqd8pgz3vnhn80giij9bpgm5r3gmna2h0rzfj";
}; };
# Fix some wrong hardcoded paths
preConfigure = '' preConfigure = ''
sed -i -e "s|/usr/lib/terminfo|${ncurses}/lib/terminfo|" configure sed -i -e "s|/usr/lib/terminfo|${ncurses}/lib/terminfo|" configure
sed -i -e "s|/usr/lib/terminfo|${ncurses}/lib/terminfo|" src/sltermin.c
sed -i -e "s|/bin/ln|ln|" src/Makefile.in sed -i -e "s|/bin/ln|ln|" src/Makefile.in
''; '';
configureFlags = "--with-png=${libpng} --with-z=${zlib} --with-pcre=${pcre} --with-readline=${readline}"; configureFlags = "--with-png=${libpng} --with-z=${zlib} --with-pcre=${pcre} --with-readline=${readline}";

10
pkgs/tools/misc/mc/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, lib, pkgconfig, glib, ncurses { stdenv, fetchurl, lib, pkgconfig, glib, ncurses, e2fsprogs, gpm
, libX11, libXt, shebangfix, perl, zip, unzip, gettext, slang}: , libX11, libXt, shebangfix, perl, zip, unzip, gettext, slang}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -7,7 +7,13 @@ stdenv.mkDerivation rec {
url = "http://www.ibiblio.org/pub/Linux/utils/file/managers/mc/${name}.tar.gz"; url = "http://www.ibiblio.org/pub/Linux/utils/file/managers/mc/${name}.tar.gz";
sha256 = "0zly25mwdn84s0wqx9mzyqi177mm828716nv1n6a4a5cm8yv0sh8"; sha256 = "0zly25mwdn84s0wqx9mzyqi177mm828716nv1n6a4a5cm8yv0sh8";
}; };
buildInputs = [pkgconfig glib ncurses libX11 libXt shebangfix perl zip unzip slang gettext]; buildInputs = [pkgconfig glib ncurses libX11 libXt
shebangfix perl zip unzip slang gettext e2fsprogs gpm];
# Fix the paths to the terminfo files. Otherwise mc has no colors
preConfigure = ''
sed -i -e "s|/usr/lib/terminfo|${ncurses}/lib/terminfo|" configure
'';
configureFlags = "--enable-charset"; configureFlags = "--enable-charset";
# Stole some patches from LFS which fix some nasty bugs # Stole some patches from LFS which fix some nasty bugs

3
pkgs/top-level/all-packages.nix
View File

@ -1012,7 +1012,8 @@ let
}; };
mc = import ../tools/misc/mc { mc = import ../tools/misc/mc {
inherit fetchurl stdenv lib pkgconfig ncurses shebangfix perl zip unzip slang gettext; inherit fetchurl stdenv lib pkgconfig ncurses shebangfix perl zip unzip slang;
inherit gettext e2fsprogs gpm;
inherit (gtkLibs) glib; inherit (gtkLibs) glib;
inherit (xlibs) libX11 libXt; inherit (xlibs) libX11 libXt;
}; };