diff --git a/src/coreboot/default.nix b/src/coreboot/default.nix index afb4a50..bbe2f8f 100644 --- a/src/coreboot/default.nix +++ b/src/coreboot/default.nix @@ -17,7 +17,7 @@ let version = "4.9"; - inherit (nixpkgsOnBuildForBuild) stdenv lib git python3 ncurses fetchgit; + inherit (nixpkgsOnBuildForBuild) stdenv lib git python3 ncurses fetchgit applyPatches; buildLinuxConfigFile = (nixpkgsOnBuildForHost.buildLinux { inherit src version; }).passthru.configfile; generate-config-pl = buildLinuxConfigFile.generateConfig; src = fetchgit { @@ -27,6 +27,27 @@ let hash = "sha256-lX6QnUS4a/F4Y68qK9i45O4OP+UEjHlCK+YaKJOQLUo="; fetchSubmodules = false; }; + libgfxinit = fetchgit { + url = "https://review.coreboot.org/libgfxinit"; + rev = "718c79bb0713b5b90c9cc44e03197dc777066e3d"; + hash = "sha256-fnIsE1MzqvGRSJnnod1/kchgJTrlWq4/XqC0URvXLrQ="; + fetchSubmodules = false; + }; + libhwbase = applyPatches { + name = "libhwbase-637f2a4f21ead8ccc45d5256834eb27ce72088db-patched"; + src = fetchgit { + url = "https://review.coreboot.org/libhwbase"; + rev = "637f2a4f21ead8ccc45d5256834eb27ce72088db"; + hash = "sha256-Tc/8GhYg10qaSGrhEBEgzfQ/K9fS95Iv6X0IyzumvWI="; + fetchSubmodules = false; + }; + patches = let inherit (nixpkgsOnBuildForBuild) fetchpatch; in [ + (fetchpatch { + url = "https://github.com/coreboot/libhwbase/commit/fc2102f560f25e0f2e5be91ec36646dcb69e6e1b.patch"; + hash = "sha256-iztcm1lb3TXKnhdmDo38ovh9GjLRmhKhWW9XmpdRGvQ="; + }) + ]; + }; flash-chip-size-in-kbytes = flash-chip-size-in-mbytes * 1024; flash-chip-size-in-bytes = flash-chip-size-in-kbytes * 1024; in @@ -128,6 +149,9 @@ stdenv.mkDerivation { ]; postPatch = '' + rm -rf 3rdparty/{libgfxinit,libhwbase} + ln -sf ${libgfxinit} 3rdparty/libgfxinit + ln -sf ${libhwbase} 3rdparty/libhwbase patchShebangs . # (from nixpkgs kernel/generic.nix): patch kconfig to print "###"