dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Revert "rustc: disable wasm32 if some gcc options are set"

Browse Source 
This reverts commits 6d0ba08b97,
723100d83b, and
bf13eca852.

The underlying issue has now been fixed, so we can re-enable
wasm32-unknown-unknown on all platforms.
This commit is contained in:
Alyssa Ross 2024-06-10 10:14:37 +01:00
parent 6f756b4065
commit b00f262516
8 changed files with 2 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/applications/blockchains/polkadot/default.nix
View File

@ -93,8 +93,5 @@ rustPlatform.buildRustPackage rec {
maintainers = with maintainers; [ akru andresilva FlorianFranzen RaghavSood ];
# See Iso::from_arch in src/isa/mod.rs in cranelift-codegen-meta.
platforms = intersectLists platforms.unix (platforms.aarch64 ++ platforms.s390x ++ platforms.riscv64 ++ platforms.x86);
# See comment about wasm32-unknown-unknown in rustc.nix.
broken = lib.any (a: lib.hasAttr a stdenv.hostPlatform.gcc) [ "cpu" "float-abi" "fpu" ] ||
!stdenv.hostPlatform.gcc.thumb or true;
};
}

4
pkgs/applications/misc/pagefind/default.nix
View File

@ -8,7 +8,6 @@
, gzip
, nodejs
, rustc
, stdenv
, wasm-bindgen-cli
, wasm-pack
}:
@ -121,9 +120,6 @@ rustPlatform.buildRustPackage rec {
license = licenses.mit;
maintainers = with maintainers; [ pbsds ];
platforms = platforms.unix;
# See comment about wasm32-unknown-unknown in rustc.nix.
broken = lib.any (a: lib.hasAttr a stdenv.hostPlatform.gcc) [ "cpu" "float-abi" "fpu" ] ||
!stdenv.hostPlatform.gcc.thumb or true;
mainProgram = "pagefind";
};
}

3
pkgs/by-name/re/rerun/package.nix
View File

@ -126,8 +126,5 @@ rustPlatform.buildRustPackage rec {
];
maintainers = with maintainers; [ SomeoneSerge ];
mainProgram = "rerun";
# See comment about wasm32-unknown-unknown in rustc.nix.
broken = lib.any (a: lib.hasAttr a stdenv.hostPlatform.gcc) [ "cpu" "float-abi" "fpu" ] ||
!stdenv.hostPlatform.gcc.thumb or true;
};
}

3
pkgs/by-name/su/surrealist/package.nix
View File

@ -166,8 +166,5 @@ in stdenv.mkDerivation (finalAttrs: {
mainProgram = "surrealist";
maintainers = with maintainers; [ frankp ];
platforms = platforms.linux;
# See comment about wasm32-unknown-unknown in rustc.nix.
broken = lib.any (a: lib.hasAttr a stdenv.hostPlatform.gcc) [ "cpu" "float-abi" "fpu" ] ||
!stdenv.hostPlatform.gcc.thumb or true;
};
})

3
pkgs/by-name/te/tetrio-desktop/tetrio-plus.nix
View File

@ -78,9 +78,6 @@ let
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ huantian wackbyte ];
platforms = lib.platforms.linux;
# See comment about wasm32-unknown-unknown in rustc.nix.
broken = lib.any (a: lib.hasAttr a stdenv.hostPlatform.gcc) [ "cpu" "float-abi" "fpu" ] ||
!stdenv.hostPlatform.gcc.thumb or true;
};
};

4
pkgs/development/compilers/rust/rustc.nix
View File

@ -106,9 +106,7 @@ in stdenv.mkDerivation (finalAttrs: {
stdenv.targetPlatform.rust.rustcTargetSpec
# Other targets that don't need any extra dependencies to build.
# Temporarily broken if some global compiler flags are set:
# https://github.com/NixOS/nixpkgs/pull/317273
] ++ optionals (!fastCross && !lib.any (a: lib.hasAttr a stdenv.hostPlatform.gcc) [ "cpu" "float-abi" "fpu" ] && stdenv.hostPlatform.gcc.thumb or true) [
] ++ optionals (!fastCross) [
"wasm32-unknown-unknown"
# (build!=target): When cross-building a compiler we need to add

4
pkgs/servers/ldap/lldap/default.nix
View File

@ -5,7 +5,6 @@
, nixosTests
, rustPlatform
, rustc
, stdenv
, wasm-bindgen-cli
, wasm-pack
, which
@ -85,9 +84,6 @@ in rustPlatform.buildRustPackage (commonDerivationAttrs // {
changelog = "https://github.com/lldap/lldap/blob/v${lldap.version}/CHANGELOG.md";
license = licenses.gpl3Only;
platforms = platforms.linux;
# See comment about wasm32-unknown-unknown in rustc.nix.
broken = lib.any (a: lib.hasAttr a stdenv.hostPlatform.gcc) [ "cpu" "float-abi" "fpu" ] ||
!stdenv.hostPlatform.gcc.thumb or true;
maintainers = with maintainers; [ bendlas ];
mainProgram = "lldap";
};

5
pkgs/servers/teleport/generic.nix
View File

@ -180,9 +180,6 @@ buildGoModule rec {
platforms = platforms.unix;
# go-libfido2 is broken on platforms with less than 64-bit because it defines an array
# which occupies more than 31 bits of address space.
broken = stdenv.hostPlatform.parsed.cpu.bits < 64 ||
# See comment about wasm32-unknown-unknown in rustc.nix.
lib.any (a: lib.hasAttr a stdenv.hostPlatform.gcc) [ "cpu" "float-abi" "fpu" ] ||
!stdenv.hostPlatform.gcc.thumb or true;
broken = stdenv.hostPlatform.parsed.cpu.bits < 64;
};
}