diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-05-09 18:01:59 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-09 18:01:59 +0000 |
| commit | 629adb097ac51255ab8b67441d94e3ba887322dc (patch) | |
| tree | 1ff0459bcdcd4861c447a67bd289df857f8d6951 /pkgs/misc | |
| parent | 580a295e9d1f2cb8178e6f1da994aea44d45c91f (diff) | |
| parent | 46659d5c4c528edce99382ccc25d8dab8b1b5cb8 (diff) | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/misc')
| -rw-r--r-- | pkgs/misc/apulse/pressureaudio.nix | 4 | ||||
| -rw-r--r-- | pkgs/misc/uboot/default.nix | 7 |
2 files changed, 9 insertions, 2 deletions
diff --git a/pkgs/misc/apulse/pressureaudio.nix b/pkgs/misc/apulse/pressureaudio.nix index def25474147b8..638334f44a5d1 100644 --- a/pkgs/misc/apulse/pressureaudio.nix +++ b/pkgs/misc/apulse/pressureaudio.nix @@ -1,4 +1,4 @@ -{ stdenv, apulse, libpulseaudio, pkg-config, intltool, autoreconfHook }: +{ stdenv, apulse, libpulseaudio, pkg-config, intltool }: stdenv.mkDerivation { pname = "libpressureaudio"; @@ -6,7 +6,7 @@ stdenv.mkDerivation { src = libpulseaudio.src; - nativeBuildInputs = [ pkg-config intltool autoreconfHook ]; + nativeBuildInputs = [ pkg-config intltool ]; dontConfigure = true; dontBuild = true; diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix index d6e5e8a7bcb0a..fc874e3d3a8e7 100644 --- a/pkgs/misc/uboot/default.nix +++ b/pkgs/misc/uboot/default.nix @@ -362,6 +362,13 @@ in { ubootQemuRiscv64Smode = buildUBoot { defconfig = "qemu-riscv64_smode_defconfig"; + extraPatches = [ + # https://patchwork.ozlabs.org/project/uboot/patch/20220128134713.2322800-1-alexandre.ghiti@canonical.com/ + (fetchpatch { + url = "https://patchwork.ozlabs.org/series/283391/mbox/"; + sha256 = "sha256-V0jDpx6O4bFzuaOQejdrRnLiWb5LBTx47T0TZqNtMXk="; + }) + ]; extraMeta.platforms = ["riscv64-linux"]; filesToInstall = ["u-boot.bin"]; }; |