M-Labs
/
nix-servo
3
1
Fork 2
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix qemu build errors #41

Merged
sb10q merged 1 commits from fsagbuya/nix-servo:qemu into master 2024-03-01 18:12:45 +08:00
Conversation 0 Commits 1 Files Changed 1 +6 -3
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
flake.nix
View File

@ -251,13 +251,16 @@
hardeningDisable = [ "fortify" ]; hardeningDisable = [ "fortify" ];
}; };
# Pinned qemu version due to networking errors in recent version 8.2.0 # Overriding qemu since the current linux kernel package upstream is breaking
qemu = pkgs.qemu.overrideAttrs (oldAttrs: rec { qemu = pkgs.qemu.overrideAttrs (oldAttrs: rec {
version = "8.1.3"; version = "8.2.1";
src = pkgs.fetchurl { src = pkgs.fetchurl {
url = "https://download.qemu.org/qemu-${version}.tar.xz"; url = "https://download.qemu.org/qemu-${version}.tar.xz";
hash = "sha256-Q8wXaAQQVYb3T5A5jzTp+FeH3/QA07ZA2B93efviZbs="; hash = "sha256-hWJ1EVgXX50YfF8itXVVq+PIcPAyXIztEsNMbZh3Kb4=";
}; };
# This patch was already removed upstream. Need to manually remove here to avoid errors.
# https://github.com/NixOS/nixpkgs/commit/d422836d725cf3aa70204036b4634dbc6fc3f678?diff=unified&w=0
patches = builtins.filter (x: (x.name or "") != "9d5b42beb6978dc6219d5dc029c9d453c6b8d503.diff") oldAttrs.patches;
}); });
board-package-set = { board }: let board-package-set = { board }: let