mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-01 15:11:25 +00:00
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:
parent
38f1b48232
commit
c0a804c747
@ -12,7 +12,9 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs = [ imake zlib jdk libX11 libXt libXmu libXaw libXext libXpm openjpeg openssl ];
|
||||
|
||||
configurePhase = "makeFlags=PREFIX=$out";
|
||||
dontUseImakeConfigure = true;
|
||||
|
||||
makeFlags = "PREFIX=$(out)";
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
|
@ -12,7 +12,9 @@ stdenv.mkDerivation rec {
|
||||
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 = ''
|
||||
sed -i config.h \
|
||||
|
@ -15,6 +15,8 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "0463bff5eea0f3d93fa071f79c18d0993878fd4f2e18ae6cf22c1639d11457ed";
|
||||
};
|
||||
|
||||
dontUseImakeConfigure = true;
|
||||
|
||||
buildInputs = [
|
||||
bzip2 gfortran libX11 libXmu libXt libXt libjpeg libpng libtiff ncurses
|
||||
pango pcre perl readline texLive xz zlib less texinfo graphviz icu
|
||||
|
@ -8,6 +8,7 @@ stdenv.mkDerivation {
|
||||
url = https://www.x.org/releases/individual/lib/libXaw3d-1.6.3.tar.bz2;
|
||||
sha256 = "0i653s8g25cc0mimkwid9366bqkbyhdyjhckx7bw77j20hzrkfid";
|
||||
};
|
||||
dontUseImakeConfigure = true;
|
||||
nativeBuildInputs = [ pkgconfig bison flex imake gccmakedep ];
|
||||
buildInputs = [ libXpm libXp ];
|
||||
propagatedBuildInputs = [ xlibsWrapper libXmu ];
|
||||
|
Loading…
Reference in New Issue
Block a user