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/libraries/blitz/default.nix
+1 -1
View File
@@ -55,7 +55,7 @@ stdenv.mkDerivation {
enableParallelBuilding = true;
buildFlags = "lib info pdf html";
buildFlags = [ "lib" "info" "pdf" "html" ];
installTargets = [ "install" "install-info" "install-pdf" "install-html" ];
inherit doCheck;
pkgs/development/libraries/cfitsio/default.nix
+1 -1
View File
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
hardeningDisable = [ "format" ];
# Shared-only build
buildFlags = "shared";
buildFlags = [ "shared" ];
postPatch = '' sed -e '/^install:/s/libcfitsio.a //' -e 's@/bin/@@g' -i Makefile.in
'';
pkgs/development/libraries/cutee/default.nix
+1 -1
View File
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "18bzvhzx8k24mpcim5669n3wg9hd0sfsxj8zjpbr24hywrlppgc2";
};
buildFlags = "cutee";
buildFlags = [ "cutee" ];
installPhase = ''
mkdir -p $out/bin
pkgs/development/libraries/filter-audio/default.nix
+1 -1
View File
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
doCheck = false;
makeFlags = "PREFIX=$(out)";
makeFlags = [ "PREFIX=$(out)" ];
meta = with stdenv.lib; {
description = "Lightweight audio filtering library made from webrtc code";
pkgs/development/libraries/gettext/default.nix
+1 -1
View File
@@ -86,5 +86,5 @@ stdenv.mkDerivation rec {
}
// stdenv.lib.optionalAttrs stdenv.isDarwin {
makeFlags = "CFLAGS=-D_FORTIFY_SOURCE=0";
makeFlags = [ "CFLAGS=-D_FORTIFY_SOURCE=0" ];
}
pkgs/development/libraries/hspell/dicts.nix
+8 -11
View File
@@ -1,42 +1,39 @@
{ stdenv, hspell }:
let
dict = a: stdenv.mkDerivation ({
dict = variant: a: stdenv.mkDerivation ({
inherit (hspell) src patchPhase nativeBuildInputs;
meta = hspell.meta // {
broken = true;
description = "${a.buildFlags} Hebrew dictionary";
description = "${variant} Hebrew dictionary";
buildFlags = [ variant ];
} // (if a ? meta then a.meta else {});
} // (removeAttrs a ["meta"]));
in
{
recurseForDerivations = true;
aspell = dict {
aspell = dict "aspell" {
name = "aspell-dict-he-${hspell.version}";
buildFlags = "aspell";
installPhase = ''
mkdir -p $out/lib/aspell
cp -v he_affix.dat he.wl $out/lib/aspell'';
};
myspell = dict {
myspell = dict "myspell" {
name = "myspell-dict-he-${hspell.version}";
buildFlags = "myspell";
installPhase = ''
mkdir -p $out/lib/myspell
cp -v he.dic he.aff $out/lib/myspell'';
};
hunspell = dict {
hunspell = dict "hunspell" {
name = "hunspell-dict-he-${hspell.version}";
buildFlags = "hunspell";
installPhase = ''
mkdir -p $out/lib
cp -rv hunspell $out/lib'';
pkgs/development/libraries/libav/default.nix
+1 -1
View File
@@ -103,7 +103,7 @@ let
setOutputFlags = false;
# alltools to build smaller tools, incl. aviocat, ismindex, qt-faststart, etc.
buildFlags = "all alltools install-man";
buildFlags = [ "all" "alltools" "install-man" ];
postInstall = ''
pkgs/development/libraries/libcef/default.nix
+1 -1
View File
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ cmake ];
makeFlags = "libcef_dll_wrapper";
makeFlags = [ "libcef_dll_wrapper" ];
dontStrip = true;
dontPatchELF = true;
pkgs/development/libraries/libcouchbase/default.nix
+1 -1
View File
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "1yfmcx65aqd5l87scha6kmm2s38n85ci3gg0h6qfs16s3jfi6bw7";
};
cmakeFlags = "-DLCB_NO_MOCK=ON";
cmakeFlags = [ "-DLCB_NO_MOCK=ON" ];
nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [ libevent openssl ];
pkgs/development/libraries/libexecinfo/default.nix
+1 -1
View File
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
makeFlags = [ "CC:=$(CC)" "AR:=$(AR)" ];
patchFlags = "-p0";
patchFlags = [ "-p0" ];
installPhase = ''
install -Dm644 execinfo.h stacktraverse.h -t $out/include
pkgs/development/libraries/libf2c/default.nix
+1 -1
View File
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
unzip ${src}
'';
makeFlags = "-f makefile.u";
makeFlags = [ "-f" "makefile.u" ];
installPhase = ''
mkdir -p $out/include $out/lib
pkgs/development/libraries/libowfat/default.nix
+1 -1
View File
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
'install -m 644 $(INCLUDES) $(DESTDIR)$(INCLUDEDIR)'
'';
makeFlags = "prefix=$(out)";
makeFlags = [ "prefix=$(out)" ];
enableParallelBuilding = true;
meta = with stdenv.lib; {
pkgs/development/libraries/libyaml-cpp/default.nix
+1 -1
View File
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ];
cmakeFlags = "-DBUILD_SHARED_LIBS=ON -DYAML_CPP_BUILD_TESTS=OFF";
cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" "-DYAML_CPP_BUILD_TESTS=OFF" ];
meta = with stdenv.lib; {
inherit (src.meta) homepage;
pkgs/development/libraries/lmdb/default.nix
+1 -1
View File
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
postUnpack = "sourceRoot=\${sourceRoot}/libraries/liblmdb";
patches = [ ./hardcoded-compiler.patch ];
patchFlags = "-p3";
patchFlags = [ "-p3" ];
outputs = [ "bin" "out" "dev" ];
pkgs/development/libraries/ois/default.nix
+1 -1
View File
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
})
];
patchFlags = "-p0";
patchFlags = [ "-p0" ];
buildInputs = [
autoconf automake libtool libX11 xorgproto libXi libXaw
pkgs/development/libraries/readline/6.2.nix
+1 -1
View File
@@ -11,7 +11,7 @@ stdenv.mkDerivation (rec {
propagatedBuildInputs = [ncurses];
patchFlags = "-p0";
patchFlags = [ "-p0" ];
patches =
[ ./link-against-ncurses.patch
./no-arch_only.patch
pkgs/development/libraries/readline/8.0.nix
+1 -1
View File
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = [ncurses];
patchFlags = "-p0";
patchFlags = [ "-p0" ];
upstreamPatches =
(let
pkgs/development/libraries/science/biology/mirtk/default.nix
+1 -1
View File
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
fetchSubmodules = true;
};
cmakeFlags = "-DWITH_VTK=ON -DBUILD_ALL_MODULES=ON";
cmakeFlags = [ "-DWITH_VTK=ON" "-DBUILD_ALL_MODULES=ON" ];
doCheck = true;
pkgs/development/libraries/science/math/fenics/default.nix
+21 -20
View File
@@ -142,26 +142,27 @@ stdenv.mkDerivation {
numpy pkgconfig six sphinx suitesparse sympy ufl vtk zlib
] ++ stdenv.lib.optionals pythonBindings [ ply python numpy swig ];
patches = [ ./unicode.patch ];
cmakeFlags = "-DDOLFIN_CXX_FLAGS=-std=c++11"
+ " -DDOLFIN_AUTO_DETECT_MPI=OFF"
+ " -DDOLFIN_ENABLE_CHOLMOD=" + (if suitesparse != null then "ON" else "OFF")
+ " -DDOLFIN_ENABLE_DOCS=" + (if docs then "ON" else "OFF")
+ " -DDOLFIN_ENABLE_GTEST=" + (if gtest != null then "ON" else "OFF")
+ " -DDOLFIN_ENABLE_HDF5=" + (if hdf5 != null then "ON" else "OFF")
+ " -DDOLFIN_ENABLE_MPI=" + (if mpi != null then "ON" else "OFF")
+ " -DDOLFIN_ENABLE_PARMETIS=OFF"
+ " -DDOLFIN_ENABLE_PETSC4PY=OFF"
+ " -DDOLFIN_ENABLE_PETSC=OFF"
+ " -DDOLFIN_ENABLE_PYTHON=" + (if pythonBindings then "ON" else "OFF")
+ " -DDOLFIN_ENABLE_SCOTCH=OFF"
+ " -DDOLFIN_ENABLE_SLEPC4PY=OFF"
+ " -DDOLFIN_ENABLE_SLEPC=OFF"
+ " -DDOLFIN_ENABLE_SPHINX=" + (if sphinx != null then "ON" else "OFF")
+ " -DDOLFIN_ENABLE_TESTING=" + (if doCheck then "ON" else "OFF")
+ " -DDOLFIN_ENABLE_TRILINOS=OFF"
+ " -DDOLFIN_ENABLE_UMFPACK=" + (if suitesparse != null then "ON" else "OFF")
+ " -DDOLFIN_ENABLE_VTK=" + (if vtk != null then "ON" else "OFF")
+ " -DDOLFIN_ENABLE_ZLIB=" + (if zlib != null then "ON" else "OFF");
cmakeFlags = [ "-DDOLFIN_CXX_FLAGS=-std=c++11"
"-DDOLFIN_AUTO_DETECT_MPI=OFF"
("-DDOLFIN_ENABLE_CHOLMOD=" + (if suitesparse != null then "ON" else "OFF"))
("-DDOLFIN_ENABLE_DOCS=" + (if docs then "ON" else "OFF"))
("-DDOLFIN_ENABLE_GTEST=" + (if gtest != null then "ON" else "OFF"))
("-DDOLFIN_ENABLE_HDF5=" + (if hdf5 != null then "ON" else "OFF"))
("-DDOLFIN_ENABLE_MPI=" + (if mpi != null then "ON" else "OFF"))
"-DDOLFIN_ENABLE_PARMETIS=OFF"
"-DDOLFIN_ENABLE_PETSC4PY=OFF"
"-DDOLFIN_ENABLE_PETSC=OFF"
("-DDOLFIN_ENABLE_PYTHON=" + (if pythonBindings then "ON" else "OFF"))
"-DDOLFIN_ENABLE_SCOTCH=OFF"
"-DDOLFIN_ENABLE_SLEPC4PY=OFF"
"-DDOLFIN_ENABLE_SLEPC=OFF"
("-DDOLFIN_ENABLE_SPHINX=" + (if sphinx != null then "ON" else "OFF"))
("-DDOLFIN_ENABLE_TESTING=" + (if doCheck then "ON" else "OFF"))
"-DDOLFIN_ENABLE_TRILINOS=OFF"
("-DDOLFIN_ENABLE_UMFPACK=" + (if suitesparse != null then "ON" else "OFF"))
("-DDOLFIN_ENABLE_VTK=" + (if vtk != null then "ON" else "OFF"))
("-DDOLFIN_ENABLE_ZLIB=" + (if zlib != null then "ON" else "OFF"))
];
checkPhase = ''
make runtests
'';
pkgs/development/libraries/t1lib/default.nix
+1 -1
View File
@@ -26,7 +26,7 @@ stdenv.mkDerivation {
inherit patches;
buildInputs = [ libX11 libXaw ];
buildFlags = "without_doc";
buildFlags = [ "without_doc" ];
postInstall = stdenv.lib.optional (!stdenv.isDarwin) "chmod +x $out/lib/*.so.*"; # ??