Simplify some builds with curses compatability

This commit is contained in:
William A. Kennington III 2015-04-30 18:23:25 -07:00
parent 27b435487c
commit f48fe899c3
3 changed files with 2 additions and 7 deletions

View File

@ -10,10 +10,6 @@ stdenv.mkDerivation rec {
buildInputs = [ ncurses ]; buildInputs = [ ncurses ];
patchPhase = ''
sed -i s/-lcurses/-lncurses/ configure
'';
preConfigure = '' preConfigure = ''
mkdir -p $out/share/man/man1 mkdir -p $out/share/man/man1
''; '';

View File

@ -17,9 +17,9 @@ stdenv.mkDerivation rec {
# nvi tries to write to a usual tmp directory (/var/tmp), # nvi tries to write to a usual tmp directory (/var/tmp),
# so we will force it to use /tmp. # so we will force it to use /tmp.
patchPhase = '' patchPhase = ''
sed -i -e s/-lcurses/-lncurses/ \ sed -i build/configure \
-e s@vi_cv_path_preserve=no@vi_cv_path_preserve=/tmp/vi.recover@ \ -e s@vi_cv_path_preserve=no@vi_cv_path_preserve=/tmp/vi.recover@ \
-e s@/var/tmp@@ build/configure -e s@/var/tmp@@
''; '';
configurePhase = '' configurePhase = ''

View File

@ -14,7 +14,6 @@ stdenv.mkDerivation rec {
configurePhase = '' configurePhase = ''
export ac_cv_lib_curses_initscr=yes export ac_cv_lib_curses_initscr=yes
export ac_cv_lib_pthread_pthread_mutex_init=yes export ac_cv_lib_pthread_pthread_mutex_init=yes
sed -i "s@-lcurses@-lncurses@g" ./configure
sed -i "s@pcap/\(.*\).pcap@$out/share/pcap/\1.pcap@g" src/scenario.cpp sed -i "s@pcap/\(.*\).pcap@$out/share/pcap/\1.pcap@g" src/scenario.cpp
./configure --prefix=$out --with-pcap ./configure --prefix=$out --with-pcap
''; '';