Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

staging-next 2023-05-02 #229429

Merged
merged 98 commits into from
May 7, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
98 commits
Select commit Hold shift + click to select a range
e935fa1
ffmpeg: add tensorflow dnn backend support
aviallon Apr 4, 2023
bbd604a
polyphone: drop redundant INCLUDEPATH to libjack2
trofi Apr 23, 2023
efe6415
numactl: move headers and mans to "dev" and "man" outputs
trofi Apr 24, 2023
43797d4
ffmpeg: don't enable tensorflow by default for full
aviallon Apr 25, 2023
8ce3ef6
Merge pull request #228025 from trofi/numactl-dev-output
trofi Apr 27, 2023
95a06f7
Merge staging-next into staging
github-actions[bot] Apr 27, 2023
ea547c8
python310Packages.cryptography: don't depend on pytest-benchmark
dotlambda Apr 27, 2023
c6355a7
python310Packages.pytest-benchmark: run tests
dotlambda Apr 27, 2023
aaaac33
Merge staging-next into staging
github-actions[bot] Apr 27, 2023
6ab9a85
Merge pull request #227866 from trofi/polyphone-no-override
trofi Apr 27, 2023
4de8043
Merge staging-next into staging
github-actions[bot] Apr 28, 2023
2b38984
Merge staging-next into staging
github-actions[bot] Apr 28, 2023
fc0e13b
python3Packages.sqlparse: 0.4.3 -> 0.4.4
LeSuisse Apr 28, 2023
6f72e87
Merge pull request #228439 from dotlambda/pytest-benchmark-test
SuperSandro2000 Apr 28, 2023
3e0cb1a
compiler-rt: use -ffreestanding when no libc
alyssais Apr 26, 2023
e5d1511
lib.systems: allow specifying libc = null
alyssais Apr 26, 2023
2839c94
pkgsLLVM.stdenv: use clangNoLibc when libc is null
alyssais Apr 26, 2023
bfc7aaa
wrapCCWith: disable pic when building for Windows
alyssais Apr 26, 2023
e1fd5ee
Merge staging-next into staging
github-actions[bot] Apr 28, 2023
7045ea4
Merge staging-next into staging
github-actions[bot] Apr 28, 2023
0949f3c
makeFontsConf: add darwin system fonts (#228619)
xworld21 Apr 28, 2023
bf42aab
Merge staging-next into staging
github-actions[bot] Apr 29, 2023
472602e
python310Packages.mkdocs-material: 9.0.15 -> 9.1.8
zowoq Apr 26, 2023
194ddee
wrapBintoolsWith: support LINK.EXE-style args in purity checks
alyssais Apr 28, 2023
47e57e2
Merge staging-next into staging
github-actions[bot] Apr 29, 2023
ebc6e9e
Merge staging-next into staging
github-actions[bot] Apr 29, 2023
83c2942
python3.pkgs.sphinxcontrib-log-cabinet: init at 1.0.1
May 12, 2022
e724676
python3.pkgs.sphinx-issues: init at 3.0.1
May 12, 2022
7e4594a
python3.pkgs.jinja2: build offline documentation
Apr 1, 2023
0f2bdfe
Merge staging-next into staging
github-actions[bot] Apr 29, 2023
c94b3f2
Merge pull request #228680 from LeSuisse/sqlparse-0.4.4
risicle Apr 29, 2023
e7b3a70
python310Packages.psutil: 5.9.4 -> 5.9.5
fabaff Apr 29, 2023
c187bb5
python310Packages.simplejson: 3.18.3 -> 3.19.1
fabaff Apr 29, 2023
a4ec253
Merge staging-next into staging
github-actions[bot] Apr 30, 2023
04045cf
python310Packages.psutil: add changelog to meta
marsam Apr 30, 2023
b4cc17e
Merge staging-next into staging
github-actions[bot] Apr 30, 2023
3611953
python3Packages.aiohttp: add setuptools to nativeBuildInputs, fix cro…
NickCao Apr 30, 2023
154c10a
Merge pull request #229016 from fabaff/simplejson-bump
marsam Apr 30, 2023
d5962b7
gst_all_1.gst-plugins-bad: remove gstmicrodns
lorenz Apr 16, 2023
0d36943
Merge staging-next into staging
github-actions[bot] Apr 30, 2023
cd72014
python3.pkgs.jinja2: don't build offline documentation by default
Ma27 Apr 30, 2023
ad454c1
or-tools: remove dev output
lopsided98 Apr 30, 2023
bf02d71
python3Packages.protobuf: remove dev output
lopsided98 Apr 30, 2023
a3cad43
pkgs/build-support: call the right makeWrapper function from wrapProg…
K900 Apr 30, 2023
a233238
gnuplot-qt: fix wrapper
K900 Apr 30, 2023
6c0d73a
Merge staging-next into staging
github-actions[bot] Apr 30, 2023
122e774
gnupg: 2.4.0 -> 2.4.1
afh Apr 30, 2023
b332f78
Merge pull request #224730 from aviallon/feature/ffmpeg-add-tensorflow
Atemu Apr 30, 2023
0fe0497
Merge staging-next into staging
github-actions[bot] May 1, 2023
5ed872d
Merge staging-next into staging
github-actions[bot] May 1, 2023
313089a
libsoup_3: 3.4.1 → 3.4.2
bobby285271 May 1, 2023
b02988a
Revert "python310Packages.aioesphomeapi: Propagate protobuf dev output"
vcunat May 1, 2023
2ca9257
Merge #229148: python3Packages.{or-tools,protobuf}: remove dev output
vcunat May 1, 2023
0905eb9
Merge #229168: gnupg: 2.4.0 -> 2.4.1
vcunat May 1, 2023
50983f1
Merge #229154: staging: make wrapProgram<Type> use the right wrapper
vcunat May 1, 2023
955c459
glslang: 1.3.243.0 -> 12.1.0
K900 May 1, 2023
33de99b
Merge master into staging-next
github-actions[bot] May 1, 2023
cff4be2
Merge staging-next into staging
github-actions[bot] May 1, 2023
2c8f7f3
spirv-tools: 1.3.243.0 -> 2023.2, remove spirv-headers version check
K900 May 1, 2023
f17401b
Merge pull request #229274 from K900/even-more-vulkan-updates
K900 May 1, 2023
00997c5
Merge pull request #228820 from alyssais/link.exe-purity
RaitoBezarius May 1, 2023
4732abc
tracker: 3.5.0 → 3.5.1
bobby285271 May 1, 2023
727e384
Merge pull request #226503 from lorenz/disable-gstmicrodns
Artturin May 1, 2023
e0e1d34
Merge master into staging-next
github-actions[bot] May 1, 2023
7783054
Merge staging-next into staging
github-actions[bot] May 1, 2023
3d83e35
Merge pull request #229015 from fabaff/psutil-bump
marsam May 1, 2023
d322e62
Merge master into staging-next
github-actions[bot] May 2, 2023
0ee4180
Merge staging-next into staging
github-actions[bot] May 2, 2023
0638816
Merge master into staging-next
github-actions[bot] May 2, 2023
574021d
Merge staging-next into staging
github-actions[bot] May 2, 2023
e808fb0
Merge #229065: python3Packages.aiohttp: setuptools to nativeBuildInputs
vcunat May 2, 2023
6183699
Merge #229253: GNOME updates 2023-05-01 (tracker, libsoup)
vcunat May 2, 2023
4a6d5a4
Merge branch 'staging' into staging-next
vcunat May 2, 2023
2f777e4
Merge master into staging-next
github-actions[bot] May 2, 2023
bdb7991
Merge master into staging-next
github-actions[bot] May 2, 2023
e7d9c82
Merge master into staging-next
github-actions[bot] May 3, 2023
2754a74
Merge master into staging-next
github-actions[bot] May 3, 2023
489a493
Merge master into staging-next
github-actions[bot] May 3, 2023
6b6c1bc
Merge master into staging-next
github-actions[bot] May 3, 2023
7be3e4a
Merge master into staging-next
github-actions[bot] May 3, 2023
9546b65
Merge master into staging-next
github-actions[bot] May 4, 2023
da9874f
Merge master into staging-next
github-actions[bot] May 4, 2023
bf19e21
Merge master into staging-next
github-actions[bot] May 4, 2023
4e4f768
Merge master into staging-next
github-actions[bot] May 4, 2023
33859d6
Merge master into staging-next
github-actions[bot] May 5, 2023
d32585d
Merge master into staging-next
github-actions[bot] May 5, 2023
1ea042c
Merge master into staging-next
github-actions[bot] May 5, 2023
c0860aa
Merge master into staging-next
github-actions[bot] May 5, 2023
5f01ee5
python311Packages.pytest-benchmark: disable tests broken on python 3.11
SuperSandro2000 May 5, 2023
f62c3cb
Merge master into staging-next
github-actions[bot] May 6, 2023
fd29280
Merge master into staging-next
github-actions[bot] May 6, 2023
94b421f
Merge #230170: python311Packages.pytest-benchmark: disable tests
vcunat May 6, 2023
805ffde
Merge master into staging-next
github-actions[bot] May 6, 2023
95930c3
Merge master into staging-next
github-actions[bot] May 6, 2023
3510094
Merge master into staging-next
github-actions[bot] May 7, 2023
9446898
Merge master into staging-next
github-actions[bot] May 7, 2023
1d6af3f
notmuch: skip two PGP tests
vcunat May 7, 2023
5844313
Merge master into staging-next
github-actions[bot] May 7, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions lib/systems/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ rec {
else if final.isFreeBSD then "fblibc"
else if final.isNetBSD then "nblibc"
else if final.isAvr then "avrlibc"
else if final.isGhcjs then null
else if final.isNone then "newlib"
# TODO(@Ericson2314) think more about other operating systems
else "native/impure";
Expand Down
1 change: 0 additions & 1 deletion pkgs/applications/audio/polyphone/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ mkDerivation rec {
qmakeFlags = [
"DEFINES+=USE_LOCAL_STK"
"DEFINES+=USE_LOCAL_QCUSTOMPLOT"
"INCLUDEPATH+=${libjack2}/include/jack"
];

meta = with lib; {
Expand Down
4 changes: 4 additions & 0 deletions pkgs/applications/networking/mailreaders/notmuch/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,10 @@ stdenv.mkDerivation rec {
in ''
mkdir -p test/test-databases
ln -s ${test-database} test/test-databases/database-v1.tar.xz
''
# Issues since gnupg: 2.4.0 -> 2.4.1
+ ''
rm test/{T350-crypto,T357-index-decryption}.sh
'';

doCheck = !stdenv.hostPlatform.isDarwin && (lib.versionAtLeast gmime3.version "3.0.3");
Expand Down
10 changes: 6 additions & 4 deletions pkgs/build-support/bintools-wrapper/ld-wrapper.sh
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,12 @@ if [[ "${NIX_ENFORCE_PURITY:-}" = 1 && -n "${NIX_STORE:-}"
# produces '-syslibroot //' linker flag. It's a no-op,
# which does not introduce impurities.
n+=1; skip "$p2"
elif [ "${p:0:1}" = / ] && badPath "$p"; then
# We cannot skip this; barf.
echo "impure path \`$p' used in link" >&2
exit 1
elif [ "${p:0:10}" = /LIBPATH:/ ] && badPath "${p:9}"; then
reject "${p:9}"
# We need to not match LINK.EXE-style flags like
# /NOLOGO or /LIBPATH:/nix/store/foo
elif [[ $p =~ ^/[^:]*/ ]] && badPath "$p"; then
reject "$p"
elif [ "${p:0:9}" = --sysroot ]; then
# Our ld is not built with sysroot support (Can we fix that?)
:
Expand Down
2 changes: 1 addition & 1 deletion pkgs/build-support/cc-wrapper/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -518,7 +518,7 @@ stdenv.mkDerivation {
''

# TODO: categorize these and figure out a better place for them
+ optionalString hostPlatform.isCygwin ''
+ optionalString targetPlatform.isWindows ''
hardening_unsupported_flags+=" pic"
'' + optionalString targetPlatform.isMinGW ''
hardening_unsupported_flags+=" stackprotector fortify"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ wrapProgramBinary() {
hidden="${hidden}_"
done
mv "$prog" "$hidden"
makeWrapper "$hidden" "$prog" --inherit-argv0 "${@:2}"
makeBinaryWrapper "$hidden" "$prog" --inherit-argv0 "${@:2}"
}

# Generate source code for the wrapper in such a way that the wrapper inputs
Expand Down
2 changes: 1 addition & 1 deletion pkgs/build-support/setup-hooks/make-wrapper.sh
Original file line number Diff line number Diff line change
Expand Up @@ -217,5 +217,5 @@ wrapProgramShell() {
hidden="${hidden}_"
done
mv "$prog" "$hidden"
makeWrapper "$hidden" "$prog" --inherit-argv0 "${@:2}"
makeShellWrapper "$hidden" "$prog" --inherit-argv0 "${@:2}"
}
7 changes: 6 additions & 1 deletion pkgs/build-support/wrapper-common/utils.bash
Original file line number Diff line number Diff line change
Expand Up @@ -84,12 +84,17 @@ mangleVarSingle() {
done
}

skip () {
skip() {
if (( "${NIX_DEBUG:-0}" >= 1 )); then
echo "skipping impure path $1" >&2
fi
}

reject() {
echo "impure path \`$1' used in link" >&2
exit 1
}


# Checks whether a path is impure. E.g., `/lib/foo.so' is impure, but
# `/nix/store/.../lib/foo.so' isn't.
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/compilers/glslang/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@
}:
stdenv.mkDerivation rec {
pname = "glslang";
version = "1.3.243.0";
version = "12.1.0";

src = fetchFromGitHub {
owner = "KhronosGroup";
repo = "glslang";
rev = "sdk-${version}";
rev = version;
hash = "sha256-U45/7G02o82EP4zh7i2Go0VCnsO1B7vxDwIokjyo5Rk=";
};

Expand Down
6 changes: 4 additions & 2 deletions pkgs/development/compilers/llvm/10/compiler-rt/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,6 @@ stdenv.mkDerivation {
"-DCMAKE_CXX_COMPILER_WORKS=ON"
"-DCOMPILER_RT_BAREMETAL_BUILD=ON"
"-DCMAKE_SIZEOF_VOID_P=${toString (stdenv.hostPlatform.parsed.cpu.bits / 8)}"
] ++ lib.optionals (useLLVM && !haveLibc) [
"-DCMAKE_C_FLAGS=-nodefaultlibs"
] ++ lib.optionals (useLLVM) [
"-DCOMPILER_RT_BUILD_BUILTINS=ON"
#https://stackoverflow.com/questions/53633705/cmake-the-c-compiler-is-not-able-to-compile-a-simple-test-program
Expand Down Expand Up @@ -90,6 +88,10 @@ stdenv.mkDerivation {
--replace "#include <assert.h>" ""
'';

preConfigure = lib.optionalString (useLLVM && !haveLibc) ''
cmakeFlagsArray+=(-DCMAKE_C_FLAGS="-nodefaultlibs -ffreestanding")
'';

# Hack around weird upsream RPATH bug
postInstall = lib.optionalString (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isWasm) ''
ln -s "$out/lib"/*/* "$out/lib"
Expand Down
3 changes: 2 additions & 1 deletion pkgs/development/compilers/llvm/10/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,8 @@ let

# pick clang appropriate for package set we are targeting
clang =
/**/ if stdenv.targetPlatform.useLLVM or false then tools.clangUseLLVM
/**/ if stdenv.targetPlatform.libc == null then tools.clangNoLibc
else if stdenv.targetPlatform.useLLVM or false then tools.clangUseLLVM
else if (pkgs.targetPackages.stdenv or stdenv).cc.isGNU then tools.libstdcxxClang
else tools.libcxxClang;

Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/compilers/llvm/11/compiler-rt/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,6 @@ stdenv.mkDerivation {
"-DCMAKE_CXX_COMPILER_WORKS=ON"
"-DCOMPILER_RT_BAREMETAL_BUILD=ON"
"-DCMAKE_SIZEOF_VOID_P=${toString (stdenv.hostPlatform.parsed.cpu.bits / 8)}"
] ++ lib.optionals (!haveLibc) [
"-DCMAKE_C_FLAGS=-nodefaultlibs"
] ++ lib.optionals (useLLVM || isNewDarwinBootstrap) [
"-DCOMPILER_RT_BUILD_BUILTINS=ON"
#https://stackoverflow.com/questions/53633705/cmake-the-c-compiler-is-not-able-to-compile-a-simple-test-program
Expand Down Expand Up @@ -75,6 +73,8 @@ stdenv.mkDerivation {

preConfigure = lib.optionalString stdenv.hostPlatform.isDarwin ''
cmakeFlagsArray+=("-DCMAKE_LIPO=$(command -v ${stdenv.cc.targetPrefix}lipo)")
'' + lib.optionalString (!haveLibc) ''
cmakeFlagsArray+=("-DCMAKE_C_FLAGS=-nodefaultlibs -ffreestanding")
'';

# TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks
Expand Down
3 changes: 2 additions & 1 deletion pkgs/development/compilers/llvm/11/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,8 @@ let

# pick clang appropriate for package set we are targeting
clang =
/**/ if stdenv.targetPlatform.useLLVM or false then tools.clangUseLLVM
/**/ if stdenv.targetPlatform.libc == null then tools.clangNoLibc
else if stdenv.targetPlatform.useLLVM or false then tools.clangUseLLVM
else if (pkgs.targetPackages.stdenv or stdenv).cc.isGNU then tools.libstdcxxClang
else tools.libcxxClang;

Expand Down
6 changes: 4 additions & 2 deletions pkgs/development/compilers/llvm/12/compiler-rt/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,6 @@ stdenv.mkDerivation {
"-DCMAKE_CXX_COMPILER_WORKS=ON"
"-DCOMPILER_RT_BAREMETAL_BUILD=ON"
"-DCMAKE_SIZEOF_VOID_P=${toString (stdenv.hostPlatform.parsed.cpu.bits / 8)}"
] ++ lib.optionals (useLLVM && !haveLibc) [
"-DCMAKE_C_FLAGS=-nodefaultlibs"
] ++ lib.optionals (useLLVM) [
"-DCOMPILER_RT_BUILD_BUILTINS=ON"
#https://stackoverflow.com/questions/53633705/cmake-the-c-compiler-is-not-able-to-compile-a-simple-test-program
Expand Down Expand Up @@ -93,6 +91,10 @@ stdenv.mkDerivation {
--replace "#include <assert.h>" ""
'';

preConfigure = lib.optionalString (useLLVM && !haveLibc) ''
cmakeFlagsArray+=(-DCMAKE_C_FLAGS="-nodefaultlibs -ffreestanding")
'';

# Hack around weird upsream RPATH bug
postInstall = lib.optionalString (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isWasm) ''
ln -s "$out/lib"/*/* "$out/lib"
Expand Down
3 changes: 2 additions & 1 deletion pkgs/development/compilers/llvm/12/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,8 @@ let

# pick clang appropriate for package set we are targeting
clang =
/**/ if stdenv.targetPlatform.useLLVM or false then tools.clangUseLLVM
/**/ if stdenv.targetPlatform.libc == null then tools.clangNoLibc
else if stdenv.targetPlatform.useLLVM or false then tools.clangUseLLVM
else if (pkgs.targetPackages.stdenv or stdenv).cc.isGNU then tools.libstdcxxClang
else tools.libcxxClang;

Expand Down
6 changes: 4 additions & 2 deletions pkgs/development/compilers/llvm/13/compiler-rt/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,6 @@ stdenv.mkDerivation {
"-DCMAKE_CXX_COMPILER_WORKS=ON"
"-DCOMPILER_RT_BAREMETAL_BUILD=ON"
"-DCMAKE_SIZEOF_VOID_P=${toString (stdenv.hostPlatform.parsed.cpu.bits / 8)}"
] ++ lib.optionals (useLLVM && !haveLibc) [
"-DCMAKE_C_FLAGS=-nodefaultlibs"
] ++ lib.optionals (useLLVM) [
"-DCOMPILER_RT_BUILD_BUILTINS=ON"
#https://stackoverflow.com/questions/53633705/cmake-the-c-compiler-is-not-able-to-compile-a-simple-test-program
Expand Down Expand Up @@ -100,6 +98,10 @@ stdenv.mkDerivation {
--replace "#include <assert.h>" ""
'';

preConfigure = lib.optionalString (useLLVM && !haveLibc) ''
cmakeFlagsArray+=(-DCMAKE_C_FLAGS="-nodefaultlibs -ffreestanding")
'';

# Hack around weird upsream RPATH bug
postInstall = lib.optionalString (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isWasm) ''
ln -s "$out/lib"/*/* "$out/lib"
Expand Down
3 changes: 2 additions & 1 deletion pkgs/development/compilers/llvm/13/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,8 @@ let

# pick clang appropriate for package set we are targeting
clang =
/**/ if stdenv.targetPlatform.useLLVM or false then tools.clangUseLLVM
/**/ if stdenv.targetPlatform.libc == null then tools.clangNoLibc
else if stdenv.targetPlatform.useLLVM or false then tools.clangUseLLVM
else if (pkgs.targetPackages.stdenv or stdenv).cc.isGNU then tools.libstdcxxClang
else tools.libcxxClang;

Expand Down
6 changes: 4 additions & 2 deletions pkgs/development/compilers/llvm/14/compiler-rt/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,6 @@ stdenv.mkDerivation {
"-DCMAKE_CXX_COMPILER_WORKS=ON"
"-DCOMPILER_RT_BAREMETAL_BUILD=ON"
"-DCMAKE_SIZEOF_VOID_P=${toString (stdenv.hostPlatform.parsed.cpu.bits / 8)}"
] ++ lib.optionals (useLLVM && !haveLibc) [
"-DCMAKE_C_FLAGS=-nodefaultlibs"
] ++ lib.optionals (useLLVM) [
"-DCOMPILER_RT_BUILD_BUILTINS=ON"
#https://stackoverflow.com/questions/53633705/cmake-the-c-compiler-is-not-able-to-compile-a-simple-test-program
Expand Down Expand Up @@ -109,6 +107,10 @@ stdenv.mkDerivation {
--replace "#include <assert.h>" ""
'';

preConfigure = lib.optionalString (useLLVM && !haveLibc) ''
cmakeFlagsArray+=(-DCMAKE_C_FLAGS="-nodefaultlibs -ffreestanding")
'';

# Hack around weird upsream RPATH bug
postInstall = lib.optionalString (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isWasm) ''
ln -s "$out/lib"/*/* "$out/lib"
Expand Down
3 changes: 2 additions & 1 deletion pkgs/development/compilers/llvm/14/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,8 @@ let

# pick clang appropriate for package set we are targeting
clang =
/**/ if stdenv.targetPlatform.useLLVM or false then tools.clangUseLLVM
/**/ if stdenv.targetPlatform.libc == null then tools.clangNoLibc
else if stdenv.targetPlatform.useLLVM or false then tools.clangUseLLVM
else if (pkgs.targetPackages.stdenv or stdenv).cc.isGNU then tools.libstdcxxClang
else tools.libcxxClang;

Expand Down
6 changes: 4 additions & 2 deletions pkgs/development/compilers/llvm/15/compiler-rt/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,6 @@ stdenv.mkDerivation {
"-DCMAKE_CXX_COMPILER_WORKS=ON"
"-DCOMPILER_RT_BAREMETAL_BUILD=ON"
"-DCMAKE_SIZEOF_VOID_P=${toString (stdenv.hostPlatform.parsed.cpu.bits / 8)}"
] ++ lib.optionals (useLLVM && !haveLibc) [
"-DCMAKE_C_FLAGS=-nodefaultlibs"
] ++ lib.optionals (useLLVM) [
"-DCOMPILER_RT_BUILD_BUILTINS=ON"
#https://stackoverflow.com/questions/53633705/cmake-the-c-compiler-is-not-able-to-compile-a-simple-test-program
Expand Down Expand Up @@ -108,6 +106,10 @@ stdenv.mkDerivation {
--replace "#include <assert.h>" ""
'';

preConfigure = lib.optionalString (useLLVM && !haveLibc) ''
cmakeFlagsArray+=(-DCMAKE_C_FLAGS="-nodefaultlibs -ffreestanding")
'';

# Hack around weird upsream RPATH bug
postInstall = lib.optionalString (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isWasm) ''
ln -s "$out/lib"/*/* "$out/lib"
Expand Down
3 changes: 2 additions & 1 deletion pkgs/development/compilers/llvm/15/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,8 @@ in let

# pick clang appropriate for package set we are targeting
clang =
/**/ if stdenv.targetPlatform.useLLVM or false then tools.clangUseLLVM
/**/ if stdenv.targetPlatform.libc == null then tools.clangNoLibc
else if stdenv.targetPlatform.useLLVM or false then tools.clangUseLLVM
else if (pkgs.targetPackages.stdenv or stdenv).cc.isGNU then tools.libstdcxxClang
else tools.libcxxClang;

Expand Down
3 changes: 2 additions & 1 deletion pkgs/development/compilers/llvm/5/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,8 @@ let

# pick clang appropriate for package set we are targeting
clang =
/**/ if stdenv.targetPlatform.useLLVM or false then tools.clangUseLLVM
/**/ if stdenv.targetPlatform.libc == null then tools.clangNoLibc
else if stdenv.targetPlatform.useLLVM or false then tools.clangUseLLVM
else if (pkgs.targetPackages.stdenv or stdenv).cc.isGNU then tools.libstdcxxClang
else tools.libcxxClang;

Expand Down
3 changes: 2 additions & 1 deletion pkgs/development/compilers/llvm/6/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,8 @@ let

# pick clang appropriate for package set we are targeting
clang =
/**/ if stdenv.targetPlatform.useLLVM or false then tools.clangUseLLVM
/**/ if stdenv.targetPlatform.libc == null then tools.clangNoLibc
else if stdenv.targetPlatform.useLLVM or false then tools.clangUseLLVM
else if (pkgs.targetPackages.stdenv or stdenv).cc.isGNU then tools.libstdcxxClang
else tools.libcxxClang;

Expand Down
6 changes: 4 additions & 2 deletions pkgs/development/compilers/llvm/7/compiler-rt/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,6 @@ stdenv.mkDerivation {
"-DCMAKE_CXX_COMPILER_WORKS=ON"
"-DCOMPILER_RT_BAREMETAL_BUILD=ON"
"-DCMAKE_SIZEOF_VOID_P=${toString (stdenv.hostPlatform.parsed.cpu.bits / 8)}"
] ++ lib.optionals (useLLVM && !haveLibc) [
"-DCMAKE_C_FLAGS=-nodefaultlibs"
] ++ lib.optionals (useLLVM) [
"-DCOMPILER_RT_BUILD_BUILTINS=ON"
#https://stackoverflow.com/questions/53633705/cmake-the-c-compiler-is-not-able-to-compile-a-simple-test-program
Expand Down Expand Up @@ -84,6 +82,10 @@ stdenv.mkDerivation {
--replace "#include <assert.h>" ""
'';

preConfigure = lib.optionalString (useLLVM && !haveLibc) ''
cmakeFlagsArray+=(-DCMAKE_C_FLAGS="-nodefaultlibs -ffreestanding")
'';

# Hack around weird upsream RPATH bug
postInstall = lib.optionalString (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isWasm) ''
ln -s "$out/lib"/*/* "$out/lib"
Expand Down
3 changes: 2 additions & 1 deletion pkgs/development/compilers/llvm/7/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,8 @@ let

# pick clang appropriate for package set we are targeting
clang =
/**/ if stdenv.targetPlatform.useLLVM or false then tools.clangUseLLVM
/**/ if stdenv.targetPlatform.libc == null then tools.clangNoLibc
else if stdenv.targetPlatform.useLLVM or false then tools.clangUseLLVM
else if (pkgs.targetPackages.stdenv or stdenv).cc.isGNU then tools.libstdcxxClang
else tools.libcxxClang;

Expand Down
6 changes: 4 additions & 2 deletions pkgs/development/compilers/llvm/8/compiler-rt/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,6 @@ stdenv.mkDerivation {
"-DCMAKE_CXX_COMPILER_WORKS=ON"
"-DCOMPILER_RT_BAREMETAL_BUILD=ON"
"-DCMAKE_SIZEOF_VOID_P=${toString (stdenv.hostPlatform.parsed.cpu.bits / 8)}"
] ++ lib.optionals (useLLVM && !haveLibc) [
"-DCMAKE_C_FLAGS=-nodefaultlibs"
] ++ lib.optionals (useLLVM) [
"-DCOMPILER_RT_BUILD_BUILTINS=ON"
#https://stackoverflow.com/questions/53633705/cmake-the-c-compiler-is-not-able-to-compile-a-simple-test-program
Expand Down Expand Up @@ -84,6 +82,10 @@ stdenv.mkDerivation {
--replace "#include <assert.h>" ""
'';

preConfigure = lib.optionalString (useLLVM && !haveLibc) ''
cmakeFlagsArray+=(-DCMAKE_C_FLAGS="-nodefaultlibs -ffreestanding")
'';

# Hack around weird upsream RPATH bug
postInstall = lib.optionalString (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isWasm) ''
ln -s "$out/lib"/*/* "$out/lib"
Expand Down
3 changes: 2 additions & 1 deletion pkgs/development/compilers/llvm/8/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,8 @@ let

# pick clang appropriate for package set we are targeting
clang =
/**/ if stdenv.targetPlatform.useLLVM or false then tools.clangUseLLVM
/**/ if stdenv.targetPlatform.libc == null then tools.clangNoLibc
else if stdenv.targetPlatform.useLLVM or false then tools.clangUseLLVM
else if (pkgs.targetPackages.stdenv or stdenv).cc.isGNU then tools.libstdcxxClang
else tools.libcxxClang;

Expand Down
6 changes: 4 additions & 2 deletions pkgs/development/compilers/llvm/9/compiler-rt/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,6 @@ stdenv.mkDerivation {
"-DCMAKE_CXX_COMPILER_WORKS=ON"
"-DCOMPILER_RT_BAREMETAL_BUILD=ON"
"-DCMAKE_SIZEOF_VOID_P=${toString (stdenv.hostPlatform.parsed.cpu.bits / 8)}"
] ++ lib.optionals (useLLVM && !haveLibc) [
"-DCMAKE_C_FLAGS=-nodefaultlibs"
] ++ lib.optionals (useLLVM) [
"-DCOMPILER_RT_BUILD_BUILTINS=ON"
#https://stackoverflow.com/questions/53633705/cmake-the-c-compiler-is-not-able-to-compile-a-simple-test-program
Expand Down Expand Up @@ -87,6 +85,10 @@ stdenv.mkDerivation {
--replace "#include <assert.h>" ""
'';

preConfigure = lib.optionalString (useLLVM && !haveLibc) ''
cmakeFlagsArray+=(-DCMAKE_C_FLAGS="-nodefaultlibs -ffreestanding")
'';

# Hack around weird upsream RPATH bug
postInstall = lib.optionalString (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isWasm) ''
ln -s "$out/lib"/*/* "$out/lib"
Expand Down
3 changes: 2 additions & 1 deletion pkgs/development/compilers/llvm/9/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,8 @@ let

# pick clang appropriate for package set we are targeting
clang =
/**/ if stdenv.targetPlatform.useLLVM or false then tools.clangUseLLVM
/**/ if stdenv.targetPlatform.libc == null then tools.clangNoLibc
else if stdenv.targetPlatform.useLLVM or false then tools.clangUseLLVM
else if (pkgs.targetPackages.stdenv or stdenv).cc.isGNU then tools.libstdcxxClang
else tools.libcxxClang;

Expand Down
Loading