Skip to content
Open
Changes from 1 commit
Commits
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
9 changes: 0 additions & 9 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@

supportedSystems = [
"x86_64-linux"
"i686-linux"
"aarch64-linux"
];
forAllSystems = lib.genAttrs supportedSystems;
Expand Down Expand Up @@ -174,14 +173,12 @@
constituents = [
self.hydraJobs.tarball
self.hydraJobs.build.x86_64-linux
self.hydraJobs.build.i686-linux
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should we not rather exclude pre-commit for 32-bit? I think patchelf in nixpkgs ist still needed for 32-bit libs.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

pkgsi686Linux still has quiet a few references.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's what I initially tried, but flake-parts seems to pull in pre-commit as well in the dev shell. We could just remove devShells.i686-linux.default...

self.hydraJobs.build-cmake.x86_64-linux
self.hydraJobs.build-meson.x86_64-linux
# FIXME: add aarch64 emulation to our github action...
#self.hydraJobs.build.aarch64-linux
self.hydraJobs.build-sanitized.x86_64-linux
#self.hydraJobs.build-sanitized.aarch64-linux
self.hydraJobs.build-sanitized.i686-linux
self.hydraJobs.build-sanitized-clang.x86_64-linux
];
meta.description = "Release-critical builds";
Expand Down Expand Up @@ -228,9 +225,6 @@
glibc = mkShell self.packages.${system}.patchelf;
default = self.devShells.${system}.glibc;
}
// lib.optionalAttrs (system != "i686-linux") {
musl = mkShell self.packages.${system}.patchelf-musl;
}
);

packages = forAllSystems (
Expand Down Expand Up @@ -287,9 +281,6 @@
patchelf-win32 = patchelfForWindowsStatic pkgs.pkgsCross.mingw32;
patchelf-win64 = patchelfForWindowsStatic pkgs.pkgsCross.mingwW64;
}
// lib.optionalAttrs (system != "i686-linux") {
patchelf-musl = patchelfFor nixpkgs.legacyPackages.${system}.pkgsMusl;
}
);

};
Expand Down