steveej/infra
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

feat(steveej-x13s,graphical-fullblown): bump kernel and use libcamera w/ deps from unstable

Browse source
This commit is contained in:
steveej 2024-11-11 21:47:46 +01:00
parent 70401e484a
commit b85be7893a
4 changed files with 46 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

35
nix/os/devices/steveej-x13s/flake.nix
View file

@ -85,7 +85,12 @@
inherit mkNixosConfiguration;
};
overlays.libcamera = final: previous: {
overlays.libcamera = final: previous: let
webkitgtkPreConfigure = ''
export NIX_BUILD_CORES="$((NIX_BUILD_CORES > 2 ? 2 : NIX_BUILD_CORES))"
export NUMBER_OF_PROCESSORS="$NIX_BUILD_CORES"
'';
in {
wireplumber = previous.wireplumber.overrideAttrs (_: {
version = "git";
src = previous.fetchFromGitLab {
@ -108,6 +113,21 @@
../src/ipa/ipa-sign-install.sh src/ipa-priv-key.pem $out/lib/libcamera/ipa_*.so
'';
});
webkitgtk = previous.webkitgtk.overrideAttrs (attrs: {
preConfigure =
attrs.preConfigure + webkitgtkPreConfigure;
});
webkitgtk_4_1 = previous.webkitgtk_4_1.overrideAttrs (attrs: {
preConfigure =
attrs.preConfigure + webkitgtkPreConfigure;
});
webkitgtk_6_0 = previous.webkitgtk_6_0.overrideAttrs (attrs: {
preConfigure =
attrs.preConfigure + webkitgtkPreConfigure;
});
};
overlays.default = final: previous: let
@ -117,19 +137,14 @@
overlays = [self.overlays.libcamera];
};
in {
inherit pkgsUnstable;
inherit
(pkgsUnstable)
libcamera
webkitgtk
webkitgtk_4_1
webkitgtk_6_0
;
webkitgtk = previous.webkitgtk.overrideAttrs (attrs: {
preConfigure =
attrs.preConfigure
+ ''
export NIX_BUILD_CORES="$((NIX_BUILD_CORES > 8 ? 8 : NIX_BUILD_CORES))"
export NUMBER_OF_PROCESSORS="$NIX_BUILD_CORES"
'';
});
};
nixosConfigurations = {