spotlight/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

spotlights-macbook-air: Override virglrenderer only for muvm

Browse source
This commit is contained in:
Spotlight 2025-03-16 17:53:32 -04:00
parent 303e449247
commit 3ad0e19cbe
Signed by: spotlight
GPG key ID: 874AA355B3209BDC
2 changed files with 19 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

18
hosts/linux/spotlights-macbook-air/configuration.nix
View file

@ -57,19 +57,15 @@
'';
});
# muvm requires a few things for libkrun.
# muvm requires a few custom flags for libkrun.
# Additionally, we override the upstream version of
# `virglrenderer` to use separate other flags.
#
# This could also be accomplished with overriding inputs,
# but as we control the actual source, this is easier.
libkrun = prev.callPackage ./libkrun/package.nix { };
# https://github.com/NixOS/nixpkgs/pull/347792#issuecomment-2667343848
virglrenderer = prev.virglrenderer.overrideAttrs (old: {
src = final.fetchurl {
url = "https://gitlab.freedesktop.org/asahi/virglrenderer/-/archive/asahi-20241205.2/virglrenderer-asahi-20241205.2.tar.bz2";
hash = "sha256-mESFaB//RThS5Uts8dCRExfxT5DQ+QQgTDWBoQppU7U=";
};
mesonFlags = old.mesonFlags ++ [ (final.lib.mesonOption "drm-renderers" "asahi-experimental") ];
});
# https://github.com/NixOS/nixpkgs/pull/347792
# Derived from https://github.com/NixOS/nixpkgs/pull/347792
muvm = prev.callPackage ./muvm/package.nix { };
})
];

13
hosts/linux/spotlights-macbook-air/libkrun/package.nix
View file

@ -1,5 +1,6 @@
{ lib
, stdenv
, fetchurl
, fetchFromGitHub
, rustPlatform
, cargo
@ -57,7 +58,17 @@ stdenv.mkDerivation (finalAttrs: {
++ lib.optionals withGpu [
libepoxy
libdrm
virglrenderer
# We want to override the virglrenderer input.
# (Overriding for all of nixpkgs means that QEMU is repeatedly rebuilt.)
# https://github.com/NixOS/nixpkgs/pull/347792#issuecomment-2667343848
(virglrenderer.overrideAttrs
(old: {
src = fetchurl {
url = "https://gitlab.freedesktop.org/asahi/virglrenderer/-/archive/asahi-20241205.2/virglrenderer-asahi-20241205.2.tar.bz2";
hash = "sha256-mESFaB//RThS5Uts8dCRExfxT5DQ+QQgTDWBoQppU7U=";
};
mesonFlags = old.mesonFlags ++ [ (lib.mesonOption "drm-renderers" "asahi-experimental") ];
}))
]
++ lib.optional withSound pipewire
++ lib.optional sevVariant openssl;