diff options
author | Matthew Bauer <mjbauer95@gmail.com> | 2018-11-28 14:22:10 -0600 |
---|---|---|
committer | Matthew Bauer <mjbauer95@gmail.com> | 2018-11-28 20:14:45 -0600 |
commit | c0a804c747c6909c036da76472393b2fbd6413b9 (patch) | |
tree | a2166e049fa5523ca24b9a18752fe3f6c3d47fd6 | |
parent | 38f1b48232347d1a6e21a2c603c516b9a7128502 (diff) | |
download | nixpkgs-c0a804c747c6909c036da76472393b2fbd6413b9.tar nixpkgs-c0a804c747c6909c036da76472393b2fbd6413b9.tar.gz nixpkgs-c0a804c747c6909c036da76472393b2fbd6413b9.tar.bz2 nixpkgs-c0a804c747c6909c036da76472393b2fbd6413b9.tar.lz nixpkgs-c0a804c747c6909c036da76472393b2fbd6413b9.tar.xz nixpkgs-c0a804c747c6909c036da76472393b2fbd6413b9.tar.zst nixpkgs-c0a804c747c6909c036da76472393b2fbd6413b9.zip |
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
4 files changed, 9 insertions, 2 deletions
diff --git a/pkgs/applications/networking/remote/ssvnc/default.nix b/pkgs/applications/networking/remote/ssvnc/default.nix index f20bb740615..99835627f87 100644 --- a/pkgs/applications/networking/remote/ssvnc/default.nix +++ b/pkgs/applications/networking/remote/ssvnc/default.nix @@ -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" ]; diff --git a/pkgs/applications/science/electronics/tkgate/1.x.nix b/pkgs/applications/science/electronics/tkgate/1.x.nix index aca1f9a3589..ab2b75917b9 100644 --- a/pkgs/applications/science/electronics/tkgate/1.x.nix +++ b/pkgs/applications/science/electronics/tkgate/1.x.nix @@ -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 \ diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix index 2fa8f3e5d7b..5cd6bbf4bdd 100644 --- a/pkgs/applications/science/math/R/default.nix +++ b/pkgs/applications/science/math/R/default.nix @@ -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 diff --git a/pkgs/development/libraries/Xaw3d/default.nix b/pkgs/development/libraries/Xaw3d/default.nix index 0a7f02f17e5..3e496b7e981 100644 --- a/pkgs/development/libraries/Xaw3d/default.nix +++ b/pkgs/development/libraries/Xaw3d/default.nix @@ -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 ]; |