buck2: musl -> gnu

So that we can ensure dependencies are up to date
with security patches
This commit is contained in:
Ross Smyth
2025-08-31 16:51:51 -04:00
parent 95142c69e8
commit 1d76dbd9f4
3 changed files with 20 additions and 10 deletions
+4 -4
View File
@@ -1,11 +1,11 @@
{
"rust-project-aarch64-linux": "sha256-Zduna35ieycN80K2wh5OkcSaOWiqhxLJkduBk7f2XqU=",
"buck2-aarch64-linux": "sha256-dhqBYFQ6e5nWSrbUMUFoato1sb4bl95JcdqcgeC5mcs=",
"rust-project-aarch64-linux": "sha256-Pm5lEIu0hzI5BuA/LuTKjBP8S63jiz1oSB0g9tSETGU=",
"buck2-aarch64-linux": "sha256-Gn/Q2P0Fs93SbOawhzv8Z9DgbrIUlQ+9E3PyCNsV1pk=",
"buck2-aarch64-darwin": "sha256-XtGs7g64s76AYhpFDbqSuSlblRauxJM0PaAk1MNNgxA=",
"buck2-x86_64-linux": "sha256-l/W6Bza01IyOFvHb2rlBY72Tl+JNgwmkO8EhUPWrxBY=",
"buck2-x86_64-linux": "sha256-gVOho7p25okvAV8OqXppdtwOOEzqH7VWcJBT4l5CT2U=",
"rust-project-x86_64-darwin": "sha256-ePawMIfltPRK3mJJxI1BvGs6b2vIcgWzW2XTJykUsdI=",
"version": "2025-08-15",
"rust-project-x86_64-linux": "sha256-3UGgvQKSm6Qohk/NDRU1fM+eFEpqM9XMLxL2AkXXrW0=",
"rust-project-x86_64-linux": "sha256-HKctvCiXyGFzfHfB3Qj6qR2p46i5vaaZgPg2J827ou4=",
"buck2-x86_64-darwin": "sha256-wHk/tJJbupMsrcmXXNVXurfLY2TOSssMnuTZ7LNjASY=",
"rust-project-aarch64-darwin": "sha256-CkyLLv41iJTKHVB0e355ZO2MV7NzQeiF1gtWEGF5oAY=",
"prelude_fod": "sha256-cyuOMi8x8q9gd6p1obnYYDVPxyONZ+y41AFXvSbUjC0=",
+14 -4
View File
@@ -5,6 +5,7 @@
fetchurl,
installShellFiles,
versionCheckHook,
autoPatchelfHook,
zstd,
}:
@@ -49,8 +50,8 @@ let
{
x86_64-darwin = "x86_64-apple-darwin";
aarch64-darwin = "aarch64-apple-darwin";
x86_64-linux = "x86_64-unknown-linux-musl";
aarch64-linux = "aarch64-unknown-linux-musl";
x86_64-linux = "x86_64-unknown-linux-gnu";
aarch64-linux = "aarch64-unknown-linux-gnu";
}
."${stdenv.hostPlatform.system}";
in
@@ -59,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: {
version = "unstable-${buildHashes.version}"; # TODO (aseipp): kill 'unstable' once a non-prerelease is made
srcs = [
# the platform-specific, statically linked binary — which is also
# the platform-specific binary — which is also
# zstd-compressed
(fetchurl {
url = "https://github.com/facebook/buck2/releases/download/${lib.removePrefix "unstable-" finalAttrs.version}/buck2-${platform-suffix}.zst";
@@ -79,9 +80,15 @@ stdenv.mkDerivation (finalAttrs: {
strictDeps = true;
nativeBuildInputs = [
installShellFiles
autoPatchelfHook
zstd
];
buildInputs = [
#225963
stdenv.cc.cc.libgcc or null
];
installPhase = ''
runHook preInstall
@@ -91,7 +98,10 @@ stdenv.mkDerivation (finalAttrs: {
runHook postInstall
'';
postInstall =
# Have to put this at a weird stage because if it is put in
# postInstall, preFixup, or postFixup, autoPatchelf wouldn't
# have run yet
preInstallCheck =
let
emulator = stdenv.hostPlatform.emulator buildPackages;
in
+2 -2
View File
@@ -18,9 +18,9 @@ echo "Latest buck2 prerelease: $VERSION"
echo "Compatible buck2-prelude hash: $PRELUDE_HASH"
ARCHS=(
"x86_64-linux:x86_64-unknown-linux-musl"
"x86_64-linux:x86_64-unknown-linux-gnu"
"x86_64-darwin:x86_64-apple-darwin"
"aarch64-linux:aarch64-unknown-linux-musl"
"aarch64-linux:aarch64-unknown-linux-gnu"
"aarch64-darwin:aarch64-apple-darwin"
)