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

treewide: replace make/build/configure/patchFlags with nix lists

Browse Source
This commit is contained in:
Merijn Broeren
2019-12-30 12:58:11 +01:00
committed by Jan Tojnar
parent 08d5fc3934
commit 133103d709
248 changed files with 336 additions and 335 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/compilers/chicken/4/chicken.nix
+2 -2
View File
@@ -23,8 +23,8 @@ stdenv.mkDerivation {
setupHook = lib.ifEnable (bootstrap-chicken != null) ./setup-hook.sh;
buildFlags = "PLATFORM=${platform} PREFIX=$(out) VARDIR=$(out)/var/lib";
installFlags = "PLATFORM=${platform} PREFIX=$(out) VARDIR=$(out)/var/lib";
buildFlags = [ "PLATFORM=${platform}" "PREFIX=$(out)" "VARDIR=$(out)/var/lib" ];
installFlags = [ "PLATFORM=${platform}" "PREFIX=$(out)" "VARDIR=$(out)/var/lib" ];
# We need a bootstrap-chicken to regenerate the c-files after
# applying a patch to add support for CHICKEN_REPOSITORY_EXTRA
pkgs/development/compilers/chicken/5/chicken.nix
+2 -2
View File
@@ -23,8 +23,8 @@ stdenv.mkDerivation {
setupHook = lib.ifEnable (bootstrap-chicken != null) ./setup-hook.sh;
buildFlags = "PLATFORM=${platform} PREFIX=$(out)";
installFlags = "PLATFORM=${platform} PREFIX=$(out)";
buildFlags = [ "PLATFORM=${platform}" "PREFIX=$(out)" ];
installFlags = [ "PLATFORM=${platform}" "PREFIX=$(out)" ];
buildInputs = [
makeWrapper
pkgs/development/compilers/cmdstan/default.nix
+1 -1
View File
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
sha256 = "1vq1cnrkvrvbfl40j6ajc60jdrjcxag1fi6kff5pqmadfdz9564j";
};
buildFlags = "build";
buildFlags = [ "build" ];
enableParallelBuilding = true;
doCheck = true;
pkgs/development/compilers/dev86/default.nix
+1 -1
View File
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
hardeningDisable = [ "format" ];
makeFlags = "PREFIX=$(out)";
makeFlags = [ "PREFIX=$(out)" ];
meta = {
description = "Linux 8086 development environment";
pkgs/development/compilers/eli/default.nix
+1 -1
View File
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
];
# skip interactive browser check
buildFlags = "nobrowsers";
buildFlags = [ "nobrowsers" ];
preConfigure=''
pkgs/development/compilers/fpc/default.nix
+2 -2
View File
@@ -19,9 +19,9 @@ stdenv.mkDerivation rec {
sed -e "s@'/lib64/ld-linux[^']*'@'''@" -i fpcsrc/compiler/systems/t_linux.pas
'' else "";
makeFlags = "NOGDB=1 FPC=${startFPC}/bin/fpc";
makeFlags = [ "NOGDB=1" "FPC=${startFPC}/bin/fpc" ];
installFlags = "INSTALL_PREFIX=\${out}";
installFlags = [ "INSTALL_PREFIX=\${out}" ];
postInstall = ''
for i in $out/lib/fpc/*/ppc*; do
pkgs/development/compilers/fstar/default.nix
+2 -2
View File
@@ -25,12 +25,12 @@ stdenv.mkDerivation rec {
patchShebangs src/tools
patchShebangs bin
'';
buildFlags = "-C src/ocaml-output";
buildFlags = [ "-C" "src/ocaml-output" ];
preInstall = ''
mkdir -p $out/lib/ocaml/${ocamlPackages.ocaml.version}/site-lib/fstarlib
'';
installFlags = "-C src/ocaml-output";
installFlags = [ "-C" "src/ocaml-output" ];
postInstall = ''
wrapProgram $out/bin/fstar.exe --prefix PATH ":" "${z3}/bin"
'';
pkgs/development/compilers/hhvm/default.nix
+1 -1
View File
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
# the cmake package does not handle absolute CMAKE_INSTALL_INCLUDEDIR correctly
# (setting it to an absolute path causes include files to go to $out/$out/include,
# because the absolute path is interpreted with root at $out).
cmakeFlags = "-DCMAKE_INSTALL_INCLUDEDIR=include";
cmakeFlags = [ "-DCMAKE_INSTALL_INCLUDEDIR=include" ];
prePatch = ''
substituteInPlace ./configure \
pkgs/development/compilers/iasl/default.nix
+2 -4
View File
@@ -9,11 +9,9 @@ stdenv.mkDerivation rec {
sha256 = "0bqhr3ndchvfhxb31147z8gd81dysyz5dwkvmp56832d0js2564q";
};
NIX_CFLAGS_COMPILE = [
"-O3"
];
NIX_CFLAGS_COMPILE = "-O3";
buildFlags = "iasl";
buildFlags = [ "iasl" ];
buildInputs = [ bison flex ];
pkgs/development/compilers/ocaml/3.10.0.nix
+1 -1
View File
@@ -12,7 +12,7 @@ stdenv.mkDerivation (rec {
prefixKey = "-prefix ";
configureFlags = ["-no-tk" "-x11lib" xlibsWrapper];
buildFlags = "world bootstrap world.opt";
buildFlags = [ "world" "bootstrap" "world.opt" ];
buildInputs = [xlibsWrapper ncurses];
installTargets = "install installopt";
patchPhase = ''
pkgs/development/compilers/ocaml/3.11.2.nix
+3 -3
View File
@@ -7,10 +7,10 @@ let
in
stdenv.mkDerivation rec {
pname = "ocaml";
version = "3.11.2";
src = fetchurl {
url = "https://caml.inria.fr/pub/distrib/ocaml-3.11/${pname}-${version}.tar.bz2";
sha256 = "86f3387a0d7e7c8be2a3c53af083a5a726e333686208d5ea0dd6bb5ac3f58143";
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
prefixKey = "-prefix ";
configureFlags = ["-no-tk"] ++ optionals useX11 [ "-x11lib" xlibsWrapper ];
buildFlags = "world" + optionalString useNativeCompilers " bootstrap world.opt";
buildFlags = [ "world" ] ++ optionals useNativeCompilers [ "bootstrap" "world.opt" ];
buildInputs = [ncurses] ++ optionals useX11 [ xlibsWrapper ];
installTargets = "install" + optionalString useNativeCompilers " installopt";
prePatch = ''
pkgs/development/compilers/ocaml/3.12.1.nix
+3 -3
View File
@@ -7,10 +7,10 @@ let
in
stdenv.mkDerivation rec {
pname = "ocaml";
version = "3.12.1";
src = fetchurl {
url = "https://caml.inria.fr/pub/distrib/ocaml-3.12/${pname}-${version}.tar.bz2";
sha256 = "13cmhkh7s6srnlvhg3s9qzh3a5dbk2m9qr35jzq922sylwymdkzd";
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
prefixKey = "-prefix ";
configureFlags = ["-no-tk"] ++ optionals useX11 [ "-x11lib" xlibsWrapper ];
buildFlags = "world" + optionalString useNativeCompilers " bootstrap world.opt";
buildFlags = [ "world" ] ++ optionals useNativeCompilers [ "bootstrap" "world.opt" ];
buildInputs = [ncurses] ++ optionals useX11 [ xlibsWrapper ];
installTargets = "install" + optionalString useNativeCompilers " installopt";
patches = optionals stdenv.isDarwin [ ./3.12.1-darwin-fix-configure.patch ];
pkgs/development/compilers/ocaml/4.00.1.nix
+5 -5
View File
@@ -3,22 +3,22 @@
let
useX11 = !stdenv.isAarch32 && !stdenv.isMips;
useNativeCompilers = !stdenv.isMips;
inherit (stdenv.lib) optionals optionalString;
inherit (stdenv.lib) optional optionals optionalString;
in
stdenv.mkDerivation rec {
pname = "ocaml";
version = "4.00.1";
src = fetchurl {
url = "https://caml.inria.fr/pub/distrib/ocaml-4.00/${pname}-${version}.tar.bz2";
sha256 = "33c3f4acff51685f5bfd7c260f066645e767d4e865877bf1613c176a77799951";
};
prefixKey = "-prefix ";
configureFlags = ["-no-tk"] ++ optionals useX11 [ "-x11lib" xlibsWrapper ];
buildFlags = "world" + optionalString useNativeCompilers " bootstrap world.opt";
buildInputs = [ncurses] ++ optionals useX11 [ xlibsWrapper ];
configureFlags = [ "-no-tk" ] ++ optionals useX11 [ "-x11lib" xlibsWrapper ];
buildFlags = [ "world" ] ++ optionals useNativeCompilers [ "bootstrap" "world.opt" ];
buildInputs = [ ncurses ] ++ optional useX11 xlibsWrapper;
installTargets = "install" + optionalString useNativeCompilers " installopt";
preConfigure = ''
CAT=$(type -tp cat)
pkgs/development/compilers/ocaml/generic.nix
+2 -2
View File
@@ -55,10 +55,10 @@ stdenv.mkDerivation (args // {
++ optional flambdaSupport (flags "--enable-flambda" "-flambda")
;
buildFlags = "world" + optionalString useNativeCompilers " bootstrap world.opt";
buildFlags = [ "world" ] ++ optionals useNativeCompilers [ "bootstrap" "world.opt" ];
buildInputs = optional (!stdenv.lib.versionAtLeast version "4.07") ncurses
++ optionals useX11 [ libX11 xorgproto ];
installTargets = "install" + optionalString useNativeCompilers " installopt";
installTargets = [ "install" ] ++ optional useNativeCompilers "installopt";
preConfigure = optionalString (!stdenv.lib.versionAtLeast version "4.04") ''
CAT=$(type -tp cat)
sed -e "s@/bin/cat@$CAT@" -i config/auto-aux/sharpbang
pkgs/development/compilers/ocaml/metaocaml-3.09.nix
+1 -1
View File
@@ -12,7 +12,7 @@ stdenv.mkDerivation ({
prefixKey = "-prefix ";
configureFlags = ["-no-tk" "-x11lib" xlibsWrapper];
buildFlags = "world bootstrap world.opt";
buildFlags = [ "world" "bootstrap" "world.opt" ];
buildInputs = [xlibsWrapper ncurses];
installTargets = "install installopt";
patchPhase = ''