treewide: add dontUseImakeConfigure where needed

We need to set dontUseImakeConfigure in a few places to prevent imake
from overriding the default configure phase. This packages all have a
configure script that needs to get run:

- Xaw3d
- R
- tkgate
- ssvnc
This commit is contained in:
Matthew Bauer 2018-11-28 14:22:10 -06:00
parent 38f1b48232
commit c0a804c747
4 changed files with 9 additions and 2 deletions

View File

@ -12,7 +12,9 @@ stdenv.mkDerivation rec {
buildInputs = [ imake zlib jdk libX11 libXt libXmu libXaw libXext libXpm openjpeg openssl ]; buildInputs = [ imake zlib jdk libX11 libXt libXmu libXaw libXext libXpm openjpeg openssl ];
configurePhase = "makeFlags=PREFIX=$out"; dontUseImakeConfigure = true;
makeFlags = "PREFIX=$(out)";
hardeningDisable = [ "format" ]; hardeningDisable = [ "format" ];

View File

@ -12,7 +12,9 @@ stdenv.mkDerivation rec {
sha256 = "1pqywkidfpdbj18i03h97f4cimld4fb3mqfy8jjsxs12kihm18fs"; sha256 = "1pqywkidfpdbj18i03h97f4cimld4fb3mqfy8jjsxs12kihm18fs";
}; };
buildInputs = [ tcl tk libX11 which yacc flex imake xproto gccmakedep ]; nativeBuildInputs = [ which yacc flex imake gccmakedep ];
buildInputs = [ tcl tk libX11 xproto ];
dontUseImakeConfigure = true;
patchPhase = '' patchPhase = ''
sed -i config.h \ sed -i config.h \

View File

@ -15,6 +15,8 @@ stdenv.mkDerivation rec {
sha256 = "0463bff5eea0f3d93fa071f79c18d0993878fd4f2e18ae6cf22c1639d11457ed"; sha256 = "0463bff5eea0f3d93fa071f79c18d0993878fd4f2e18ae6cf22c1639d11457ed";
}; };
dontUseImakeConfigure = true;
buildInputs = [ buildInputs = [
bzip2 gfortran libX11 libXmu libXt libXt libjpeg libpng libtiff ncurses bzip2 gfortran libX11 libXmu libXt libXt libjpeg libpng libtiff ncurses
pango pcre perl readline texLive xz zlib less texinfo graphviz icu pango pcre perl readline texLive xz zlib less texinfo graphviz icu

View File

@ -8,6 +8,7 @@ stdenv.mkDerivation {
url = https://www.x.org/releases/individual/lib/libXaw3d-1.6.3.tar.bz2; url = https://www.x.org/releases/individual/lib/libXaw3d-1.6.3.tar.bz2;
sha256 = "0i653s8g25cc0mimkwid9366bqkbyhdyjhckx7bw77j20hzrkfid"; sha256 = "0i653s8g25cc0mimkwid9366bqkbyhdyjhckx7bw77j20hzrkfid";
}; };
dontUseImakeConfigure = true;
nativeBuildInputs = [ pkgconfig bison flex imake gccmakedep ]; nativeBuildInputs = [ pkgconfig bison flex imake gccmakedep ];
buildInputs = [ libXpm libXp ]; buildInputs = [ libXpm libXp ];
propagatedBuildInputs = [ xlibsWrapper libXmu ]; propagatedBuildInputs = [ xlibsWrapper libXmu ];