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.

Sign up for GitHub

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

qemu: remove out of sync buildPlatformStdenv #367764

Merged
merged 1 commit into from
Dec 24, 2024
Merged

qemu: remove out of sync buildPlatformStdenv #367764

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 1 addition & 11 deletions pkgs/applications/virtualization/qemu/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,16 +56,6 @@ assert lib.assertMsg (xenSupport -> hostCpuTargets == [ "i386-softmmu" ]) "Xen s

let
hexagonSupport = hostCpuTargets == null || lib.elem "hexagon" hostCpuTargets;

buildPlatformStdenv =
if stdenv.buildPlatform.isDarwin then
overrideSDK buildPackages.stdenv {
# Keep these values in sync with `all-packages.nix`.
darwinSdkVersion = "12.3";
darwinMinVersion = "12.0";
}
else
buildPackages.stdenv;
in

stdenv.mkDerivation (finalAttrs: {
Expand All @@ -82,7 +72,7 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-+FnwvGXh9TPQQLvoySvP7O5a8skhpmh8ZS+0TQib2JQ=";
};

depsBuildBuild = [ buildPlatformStdenv.cc ]
depsBuildBuild = [ buildPackages.stdenv.cc ]
++ lib.optionals hexagonSupport [ pkg-config ];

nativeBuildInputs = [
Expand Down
Loading