diff options
author | John Ericson <git@JohnEricson.me> | 2021-01-03 15:15:49 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-01-03 15:15:49 -0500 |
commit | b3f29f38178bbae2f873f3c851567b32426fb374 (patch) | |
tree | f37a4fc67a560edcb08f30af943bc08b9bdaad22 /pkgs | |
parent | 73a76de9d74fe7959e9e5f5d0084ba0dafd965f5 (diff) | |
parent | 8e482321805542e08eaf8819a6ad94ea4ba20370 (diff) |
Merge pull request #107238 from Ericson2314/no-static-overlay
treewide: Start to break up static overlay
Diffstat (limited to 'pkgs')
63 files changed, 179 insertions, 197 deletions
diff --git a/pkgs/development/compilers/gcc/10/default.nix b/pkgs/development/compilers/gcc/10/default.nix index 4f05cd3144cd..f346b7f4e373 100644 --- a/pkgs/development/compilers/gcc/10/default.nix +++ b/pkgs/development/compilers/gcc/10/default.nix @@ -7,7 +7,12 @@ , profiledCompiler ? false , langJit ? false , staticCompiler ? false -, enableShared ? true +, # N.B. the defult is intentionally not from an `isStatic`. See + # https://gcc.gnu.org/install/configure.html - this is about target + # platform libraries not host platform ones unlike normal. But since + # we can't rebuild those without also rebuilding the compiler itself, + # we opt to always build everything unlike our usual policy. + enableShared ? true , enableLTO ? true , texinfo ? null , perl ? null # optional, for texi2pod (then pod2man) @@ -137,10 +142,10 @@ stdenv.mkDerivation ({ ) else "") + stdenv.lib.optionalString targetPlatform.isAvr '' - makeFlagsArray+=( - 'LIMITS_H_TEST=false' - ) - ''; + makeFlagsArray+=( + 'LIMITS_H_TEST=false' + ) + ''; inherit noSysDirs staticCompiler crossStageStatic libcCross crossMingw; diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix index 213d0c91ff34..617a19e238ba 100644 --- a/pkgs/development/compilers/gcc/4.8/default.nix +++ b/pkgs/development/compilers/gcc/4.8/default.nix @@ -7,7 +7,12 @@ , profiledCompiler ? false , langJit ? false , staticCompiler ? false -, enableShared ? true +, # N.B. the defult is intentionally not from an `isStatic`. See + # https://gcc.gnu.org/install/configure.html - this is about target + # platform libraries not host platform ones unlike normal. But since + # we can't rebuild those without also rebuilding the compiler itself, + # we opt to always build everything unlike our usual policy. + enableShared ? true , enableLTO ? true , texinfo ? null , perl ? null # optional, for texi2pod (then pod2man); required for Java diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix index 98d4b61648e3..7ea80ffbeb3f 100644 --- a/pkgs/development/compilers/gcc/4.9/default.nix +++ b/pkgs/development/compilers/gcc/4.9/default.nix @@ -7,7 +7,12 @@ , profiledCompiler ? false , langJit ? false , staticCompiler ? false -, enableShared ? true +, # N.B. the defult is intentionally not from an `isStatic`. See + # https://gcc.gnu.org/install/configure.html - this is about target + # platform libraries not host platform ones unlike normal. But since + # we can't rebuild those without also rebuilding the compiler itself, + # we opt to always build everything unlike our usual policy. + enableShared ? true , enableLTO ? true , texinfo ? null , perl ? null # optional, for texi2pod (then pod2man); required for Java diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix index a2f034a4827f..f9c5c7116559 100644 --- a/pkgs/development/compilers/gcc/6/default.nix +++ b/pkgs/development/compilers/gcc/6/default.nix @@ -8,7 +8,12 @@ , profiledCompiler ? false , langJit ? false , staticCompiler ? false -, enableShared ? true +, # N.B. the defult is intentionally not from an `isStatic`. See + # https://gcc.gnu.org/install/configure.html - this is about target + # platform libraries not host platform ones unlike normal. But since + # we can't rebuild those without also rebuilding the compiler itself, + # we opt to always build everything unlike our usual policy. + enableShared ? true , enableLTO ? true , texinfo ? null , flex diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix index 6d066044ec1e..e0be04234deb 100644 --- a/pkgs/development/compilers/gcc/7/default.nix +++ b/pkgs/development/compilers/gcc/7/default.nix @@ -6,7 +6,12 @@ , profiledCompiler ? false , langJit ? false , staticCompiler ? false -, enableShared ? true +, # N.B. the defult is intentionally not from an `isStatic`. See + # https://gcc.gnu.org/install/configure.html - this is about target + # platform libraries not host platform ones unlike normal. But since + # we can't rebuild those without also rebuilding the compiler itself, + # we opt to always build everything unlike our usual policy. + enableShared ? true , enableLTO ? true , texinfo ? null , perl ? null # optional, for texi2pod (then pod2man) diff --git a/pkgs/development/compilers/gcc/8/default.nix b/pkgs/development/compilers/gcc/8/default.nix index 9e6a24d12948..75c7982ea420 100644 --- a/pkgs/development/compilers/gcc/8/default.nix +++ b/pkgs/development/compilers/gcc/8/default.nix @@ -6,7 +6,12 @@ , profiledCompiler ? false , langJit ? false , staticCompiler ? false -, enableShared ? true +, # N.B. the defult is intentionally not from an `isStatic`. See + # https://gcc.gnu.org/install/configure.html - this is about target + # platform libraries not host platform ones unlike normal. But since + # we can't rebuild those without also rebuilding the compiler itself, + # we opt to always build everything unlike our usual policy. + enableShared ? true , enableLTO ? true , texinfo ? null , perl ? null # optional, for texi2pod (then pod2man) @@ -134,10 +139,10 @@ stdenv.mkDerivation ({ ) else "") + stdenv.lib.optionalString targetPlatform.isAvr '' - makeFlagsArray+=( - 'LIMITS_H_TEST=false' - ) - ''; + makeFlagsArray+=( + 'LIMITS_H_TEST=false' + ) + ''; inherit noSysDirs staticCompiler crossStageStatic libcCross crossMingw; diff --git a/pkgs/development/compilers/gcc/9/default.nix b/pkgs/development/compilers/gcc/9/default.nix index c64a9dcc3f57..0c649eac1dbf 100644 --- a/pkgs/development/compilers/gcc/9/default.nix +++ b/pkgs/development/compilers/gcc/9/default.nix @@ -8,7 +8,12 @@ , profiledCompiler ? false , langJit ? false , staticCompiler ? false -, enableShared ? true +, # N.B. the defult is intentionally not from an `isStatic`. See + # https://gcc.gnu.org/install/configure.html - this is about target + # platform libraries not host platform ones unlike normal. But since + # we can't rebuild those without also rebuilding the compiler itself, + # we opt to always build everything unlike our usual policy. + enableShared ? true , enableLTO ? true , texinfo ? null , perl ? null # optional, for texi2pod (then pod2man) diff --git a/pkgs/development/compilers/llvm/10/libc++/default.nix b/pkgs/development/compilers/llvm/10/libc++/default.nix index 95711903932e..3511783be896 100644 --- a/pkgs/development/compilers/llvm/10/libc++/default.nix +++ b/pkgs/development/compilers/llvm/10/libc++/default.nix @@ -1,5 +1,6 @@ { lib, stdenv, fetch, cmake, python3, libcxxabi, fixDarwinDylibNames, version -, enableShared ? true }: +, enableShared ? !stdenv.hostPlatform.isStatic +}: stdenv.mkDerivation { pname = "libc++"; diff --git a/pkgs/development/compilers/llvm/10/libc++abi.nix b/pkgs/development/compilers/llvm/10/libc++abi.nix index 00371b862adb..7335d06e4fe3 100644 --- a/pkgs/development/compilers/llvm/10/libc++abi.nix +++ b/pkgs/development/compilers/llvm/10/libc++abi.nix @@ -1,5 +1,6 @@ { stdenv, cmake, fetch, libcxx, libunwind, llvm, version -, enableShared ? true }: +, enableShared ? !stdenv.hostPlatform.isStatic +}: stdenv.mkDerivation { pname = "libc++abi"; diff --git a/pkgs/development/compilers/llvm/10/libunwind.nix b/pkgs/development/compilers/llvm/10/libunwind.nix index b13bacb36380..75e42260b7fa 100644 --- a/pkgs/development/compilers/llvm/10/libunwind.nix +++ b/pkgs/development/compilers/llvm/10/libunwind.nix @@ -1,4 +1,6 @@ -{ stdenv, version, fetch, cmake, fetchpatch, enableShared ? true }: +{ stdenv, version, fetch, cmake, fetchpatch +, enableShared ? !stdenv.hostPlatform.isStatic +}: stdenv.mkDerivation rec { pname = "libunwind"; diff --git a/pkgs/development/compilers/llvm/11/libc++/default.nix b/pkgs/development/compilers/llvm/11/libc++/default.nix index 1ce879cccb67..5c3ec87617c9 100644 --- a/pkgs/development/compilers/llvm/11/libc++/default.nix +++ b/pkgs/development/compilers/llvm/11/libc++/default.nix @@ -1,5 +1,6 @@ { lib, stdenv, fetch, cmake, python3, libcxxabi, llvm, fixDarwinDylibNames, version -, enableShared ? true }: +, enableShared ? !stdenv.hostPlatform.isStatic +}: stdenv.mkDerivation { pname = "libc++"; diff --git a/pkgs/development/compilers/llvm/11/libc++abi.nix b/pkgs/development/compilers/llvm/11/libc++abi.nix index edf83197d2ca..d173b1735cbe 100644 --- a/pkgs/development/compilers/llvm/11/libc++abi.nix +++ b/pkgs/development/compilers/llvm/11/libc++abi.nix @@ -1,5 +1,6 @@ { stdenv, cmake, fetch, libcxx, libunwind, llvm, version -, enableShared ? true }: +, enableShared ? !stdenv.hostPlatform.isStatic +}: stdenv.mkDerivation { pname = "libc++abi"; diff --git a/pkgs/development/compilers/llvm/11/libunwind.nix b/pkgs/development/compilers/llvm/11/libunwind.nix index 5a4492e803f6..b22da214417f 100644 --- a/pkgs/development/compilers/llvm/11/libunwind.nix +++ b/pkgs/development/compilers/llvm/11/libunwind.nix @@ -1,4 +1,6 @@ -{ stdenv, version, fetch, cmake, fetchpatch, enableShared ? true }: +{ stdenv, version, fetch, cmake, fetchpatch +, enableShared ? !stdenv.hostPlatform.isStatic +}: stdenv.mkDerivation rec { pname = "libunwind"; diff --git a/pkgs/development/compilers/llvm/7/libc++/default.nix b/pkgs/development/compilers/llvm/7/libc++/default.nix index 76baadf1c6e9..ed4192a232e3 100644 --- a/pkgs/development/compilers/llvm/7/libc++/default.nix +++ b/pkgs/development/compilers/llvm/7/libc++/default.nix @@ -1,5 +1,6 @@ { lib, stdenv, fetch, cmake, python3, libcxxabi, fixDarwinDylibNames, version -, enableShared ? ! stdenv.hostPlatform.isMusl }: +, enableShared ? !stdenv.hostPlatform.isStatic +}: stdenv.mkDerivation { pname = "libc++"; diff --git a/pkgs/development/compilers/llvm/7/libc++abi.nix b/pkgs/development/compilers/llvm/7/libc++abi.nix index 7f2ec528f3c1..4c46aeaa1910 100644 --- a/pkgs/development/compilers/llvm/7/libc++abi.nix +++ b/pkgs/development/compilers/llvm/7/libc++abi.nix @@ -1,7 +1,8 @@ { stdenv, cmake, fetch, libcxx, llvm, version , standalone ? false # on musl the shared objects don't build -, enableShared ? ! stdenv.hostPlatform.isMusl }: +, enableShared ? !stdenv.hostPlatform.isStatic +}: stdenv.mkDerivation { pname = "libc++abi"; diff --git a/pkgs/development/compilers/llvm/8/libc++/default.nix b/pkgs/development/compilers/llvm/8/libc++/default.nix index 01e0d8e008cb..2ed54a22069b 100644 --- a/pkgs/development/compilers/llvm/8/libc++/default.nix +++ b/pkgs/development/compilers/llvm/8/libc++/default.nix @@ -1,5 +1,6 @@ { lib, stdenv, fetch, cmake, python3, libcxxabi, fixDarwinDylibNames, version -, enableShared ? true }: +, enableShared ? !stdenv.hostPlatform.isStatic +}: stdenv.mkDerivation { pname = "libc++"; diff --git a/pkgs/development/compilers/llvm/8/libc++abi.nix b/pkgs/development/compilers/llvm/8/libc++abi.nix index 590872aaab64..50a38dfa967b 100644 --- a/pkgs/development/compilers/llvm/8/libc++abi.nix +++ b/pkgs/development/compilers/llvm/8/libc++abi.nix @@ -1,5 +1,6 @@ { stdenv, cmake, fetch, libcxx, libunwind, llvm, version -, enableShared ? true }: +, enableShared ? !stdenv.hostPlatform.isStatic +}: stdenv.mkDerivation { pname = "libc++abi"; diff --git a/pkgs/development/compilers/llvm/8/libunwind.nix b/pkgs/development/compilers/llvm/8/libunwind.nix index 646cd3c3ca4a..3295d3922034 100644 --- a/pkgs/development/compilers/llvm/8/libunwind.nix +++ b/pkgs/development/compilers/llvm/8/libunwind.nix @@ -1,4 +1,6 @@ -{ stdenv, version, fetch, cmake, fetchpatch, enableShared ? true }: +{ stdenv, version, fetch, cmake, fetchpatch +, enableShared ? !stdenv.hostPlatform.isStatic +}: stdenv.mkDerivation { pname = "libunwind"; diff --git a/pkgs/development/compilers/llvm/9/libc++/default.nix b/pkgs/development/compilers/llvm/9/libc++/default.nix index c9f0e6254ab4..f5c3d21e7f1a 100644 --- a/pkgs/development/compilers/llvm/9/libc++/default.nix +++ b/pkgs/development/compilers/llvm/9/libc++/default.nix @@ -1,5 +1,6 @@ { lib, stdenv, fetch, cmake, python3, libcxxabi, fixDarwinDylibNames, version -, enableShared ? true }: +, enableShared ? !stdenv.hostPlatform.isStatic +}: stdenv.mkDerivation { pname = "libc++"; diff --git a/pkgs/development/compilers/llvm/9/libc++abi.nix b/pkgs/development/compilers/llvm/9/libc++abi.nix index 5b63560282c0..13f033091be2 100644 --- a/pkgs/development/compilers/llvm/9/libc++abi.nix +++ b/pkgs/development/compilers/llvm/9/libc++abi.nix @@ -1,5 +1,6 @@ { stdenv, cmake, fetch, libcxx, libunwind, llvm, version -, enableShared ? true }: +, enableShared ? !stdenv.hostPlatform.isStatic +}: stdenv.mkDerivation { pname = "libc++abi"; diff --git a/pkgs/development/compilers/llvm/9/libunwind.nix b/pkgs/development/compilers/llvm/9/libunwind.nix index 883c36baf062..98df98838f13 100644 --- a/pkgs/development/compilers/llvm/9/libunwind.nix +++ b/pkgs/development/compilers/llvm/9/libunwind.nix @@ -1,4 +1,6 @@ -{ stdenv, version, fetch, cmake, fetchpatch, enableShared ? true }: +{ stdenv, version, fetch, cmake, fetchpatch +, enableShared ? !stdenv.hostPlatform.isStatic +}: stdenv.mkDerivation rec { pname = "libunwind"; diff --git a/pkgs/development/libraries/arrow-cpp/default.nix b/pkgs/development/libraries/arrow-cpp/default.nix index 1d9a528b4c6a..a9e738f7e9a1 100644 --- a/pkgs/development/libraries/arrow-cpp/default.nix +++ b/pkgs/development/libraries/arrow-cpp/default.nix @@ -1,7 +1,8 @@ { stdenv, lib, fetchurl, fetchFromGitHub, fetchpatch, fixDarwinDylibNames , autoconf, boost, brotli, cmake, flatbuffers, gflags, glog, gtest, lz4 , perl, python3, rapidjson, snappy, thrift, utf8proc, which, zlib, zstd -, enableShared ? true }: +, enableShared ? !stdenv.hostPlatform.isStatic +}: |