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

* makeFlags -> buildFlags in a few places. 

svn path=/nixpkgs/trunk/; revision=7503
This commit is contained in:
Eelco Dolstra 2006-12-27 18:34:35 +00:00
parent b8b44e026c
commit f861c8b66c
17 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/audio/bmp-plugins/wma/builder.sh
View File

@ -1,6 +1,6 @@
source $stdenv/setup source $stdenv/setup
makeFlags="-f Makefile.bmp" buildFlags="-f Makefile.bmp"
installPhase=installPhase installPhase=installPhase
installPhase() { installPhase() {

2
pkgs/applications/editors/nedit/default.nix
View File

@ -15,5 +15,5 @@ stdenv.mkDerivation {
inherit motif; inherit motif;
buildInputs = [x11 motif libXpm]; buildInputs = [x11 motif libXpm];
makeFlags = if stdenv.system == "i686-linux" then "linux" else ""; buildFlags = if stdenv.system == "i686-linux" then "linux" else "";
} }

2
pkgs/applications/networking/browsers/mozilla/builder.sh
View File

@ -48,6 +48,6 @@ postInstall() {
} }
makeFlags="-f client.mk build" buildFlags="-f client.mk build"
genericBuild genericBuild

2
pkgs/development/compilers/gcc-2.95/builder.sh
View File

@ -68,6 +68,6 @@ preConfigure() {
} }
makeFlags="bootstrap" buildFlags="bootstrap"
genericBuild genericBuild

2
pkgs/development/compilers/gcc-3.3/builder.sh
View File

@ -85,6 +85,6 @@ postConfigure() {
postConfigure=postConfigure postConfigure=postConfigure
makeFlags="bootstrap" buildFlags="bootstrap"
genericBuild genericBuild

4
pkgs/development/compilers/gcc-3.4-arm/builder.sh
View File

@ -79,9 +79,9 @@ postInstall() {
#if test -z "$profiledCompiler"; then #if test -z "$profiledCompiler"; then
# makeFlags="bootstrap" # buildFlags="bootstrap"
#else #else
# makeFlags="profiledbootstrap" # buildFlags="profiledbootstrap"
#fi #fi
genericBuild genericBuild

4
pkgs/development/compilers/gcc-3.4/builder.sh
View File

@ -69,9 +69,9 @@ postInstall() {
if test -z "$profiledCompiler"; then if test -z "$profiledCompiler"; then
makeFlags="bootstrap $makeFlags" buildFlags="bootstrap $buildFlags"
else else
makeFlags="profiledbootstrap $makeFlags" buildFlags="profiledbootstrap $buildFlags"
fi fi
genericBuild genericBuild

4
pkgs/development/compilers/gcc-4.0-cross/builder.sh
View File

@ -89,9 +89,9 @@ postInstall() {
#if test -z "$profiledCompiler"; then #if test -z "$profiledCompiler"; then
#makeFlags="bootstrap" #buildFlags="bootstrap"
#else #else
#makeFlags="profiledbootstrap" #buildFlags="profiledbootstrap"
#fi #fi
genericBuild genericBuild

4
pkgs/development/compilers/gcc-4.0/builder.sh
View File

@ -92,9 +92,9 @@ postInstall() {
if test -z "$profiledCompiler"; then if test -z "$profiledCompiler"; then
makeFlags="bootstrap" buildFlags="bootstrap"
else else
makeFlags="profiledbootstrap" buildFlags="profiledbootstrap"
fi fi
genericBuild genericBuild

4
pkgs/development/compilers/gcc-4.1/builder.sh
View File

@ -75,9 +75,9 @@ postInstall() {
if test -z "$staticCompiler"; then if test -z "$staticCompiler"; then
if test -z "$profiledCompiler"; then if test -z "$profiledCompiler"; then
makeFlags="bootstrap $makeFlags" buildFlags="bootstrap $buildFlags"
else else
makeFlags="profiledbootstrap $makeFlags" buildFlags="profiledbootstrap $buildFlags"
fi fi
fi fi

2
pkgs/development/compilers/ocaml/ocaml-3.08.0.nix
View File

@ -10,6 +10,6 @@ stdenv.mkDerivation {
configureScript = ./configure-3.08.0; configureScript = ./configure-3.08.0;
dontAddPrefix = "True"; dontAddPrefix = "True";
configureFlags = ["-no-tk" "-x11lib" x11]; configureFlags = ["-no-tk" "-x11lib" x11];
makeFlags = ["world" "bootstrap" "opt"]; buildFlags = ["world" "bootstrap" "opt"];
checkTarget = ["opt.opt"]; checkTarget = ["opt.opt"];
} }

2
pkgs/development/compilers/ocaml/ocaml-3.09.1.nix
View File

@ -10,6 +10,6 @@ stdenv.mkDerivation {
configureScript = ./configure-3.09.1; configureScript = ./configure-3.09.1;
dontAddPrefix = "True"; dontAddPrefix = "True";
configureFlags = ["-no-tk" "-x11lib" x11]; configureFlags = ["-no-tk" "-x11lib" x11];
makeFlags = ["world" "bootstrap" "opt"]; buildFlags = ["world" "bootstrap" "opt"];
checkTarget = ["opt.opt"]; checkTarget = ["opt.opt"];
} }

2
pkgs/development/interpreters/lua-4/builder.sh
View File

@ -1,6 +1,6 @@
source $stdenv/setup source $stdenv/setup
makeFlags="all so sobin" buildFlags="all so sobin"
installFlags="INSTALL_ROOT=$out" installFlags="INSTALL_ROOT=$out"
genericBuild genericBuild

2
pkgs/development/interpreters/lua-5/builder.sh
View File

@ -1,6 +1,6 @@
source $stdenv/setup source $stdenv/setup
makeFlags="all so sobin" buildFlags="all so sobin"
installFlags="soinstall INSTALL_ROOT=$out" installFlags="soinstall INSTALL_ROOT=$out"
genericBuild genericBuild

2
pkgs/development/libraries/mesa/builder.sh
View File

@ -1,6 +1,6 @@
source $stdenv/setup source $stdenv/setup
makeFlags="linux-x86" buildFlags="linux-x86"
installPhase=installPhase installPhase=installPhase
installPhase() { installPhase() {

2
pkgs/development/libraries/t1lib/default.nix
View File

@ -7,5 +7,5 @@ stdenv.mkDerivation {
md5 = "a05bed4aa63637052e60690ccde70421"; md5 = "a05bed4aa63637052e60690ccde70421";
}; };
buildInputs = [x11 libXaw]; buildInputs = [x11 libXaw];
makeFlags = "without_doc"; buildFlags = "without_doc";
} }

2
pkgs/tools/archivers/zip/builder.sh
View File

@ -1,6 +1,6 @@
source $stdenv/setup source $stdenv/setup
makeFlags="-f unix/Makefile generic" buildFlags="-f unix/Makefile generic"
installFlags="-f unix/Makefile prefix=$out INSTALL=cp" installFlags="-f unix/Makefile prefix=$out INSTALL=cp"