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

nix/os/devices/steveej-x13s: bump versions

Browse source
This commit is contained in:
steveej 2024-12-10 21:22:52 +01:00
parent ea8258e4d9
commit d09c7c2f7e
2 changed files with 8 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

16
nix/os/devices/steveej-x13s/flake.lock generated
View file

@ -165,16 +165,16 @@
"linux-jhovold": { "linux-jhovold": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1733214488, "lastModified": 1733829848,
"narHash": "sha256-nhS3FgdJm1KBjAuTePgcQ4oXzigyDufQfz2TUUahHtM=", "narHash": "sha256-eSMC7QBA4N6oKNemce/7tuyjGHHnXDjoLJLyxHaJrJI=",
"owner": "jhovold", "owner": "jhovold",
"repo": "linux", "repo": "linux",
"rev": "ccd13b9fd1a31c869789e2320e777bfdc150face", "rev": "bc85c6f253096667ccbf2a60d37070f347e67ae4",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "jhovold", "owner": "jhovold",
"ref": "wip/sc8280xp-6.13-rc1", "ref": "wip/sc8280xp-6.13-rc2",
"repo": "linux", "repo": "linux",
"type": "github" "type": "github"
} }
@ -248,11 +248,11 @@
"x13s-bt-linux-firmware": "x13s-bt-linux-firmware" "x13s-bt-linux-firmware": "x13s-bt-linux-firmware"
}, },
"locked": { "locked": {
"lastModified": 1733393262, "lastModified": 1733855385,
"narHash": "sha256-cbpUix+ggnZtTT7Rtr1+A+iX+fI+KpduaGOOTXhaQWU=", "narHash": "sha256-+13My4h6WUJ+M10gKS0aVUlyIdp4zKqB6FKxyCAyxQ0=",
"ref": "bump", "ref": "bump",
"rev": "b116d698f4b531a7577ccb875ca6a8106b9d63ee", "rev": "c95058f8aa1b361df3874429c5dc0f694f9cba78",
"revCount": 127, "revCount": 128,
"type": "git", "type": "git",
"url": "https://forgejo.www.stefanjunker.de/steveej/nixos-x13s.git" "url": "https://forgejo.www.stefanjunker.de/steveej/nixos-x13s.git"
}, },

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

@ -80,59 +80,7 @@
inherit mkNixosConfiguration; inherit mkNixosConfiguration;
}; };
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 {
domain = "gitlab.freedesktop.org";
owner = "pipewire";
repo = "wireplumber";
rev = "71f868233792f10848644319dbdc97a4f147d554";
hash = "sha256-VX3OFsBK9AbISm/XTx8p05ak+z/VcKXfUXhB9aI9ev8=";
};
});
libcamera = previous.libcamera.overrideAttrs (_: {
postFixup = ''
../src/ipa/ipa-sign-install.sh src/ipa-priv-key.pem $out/lib/libcamera/ipa_*.so
'';
});
libcamera-qcam = previous.libcamera-qcam.overrideAttrs (_: {
postFixup = ''
../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: { overlays.default = _final: _previous: {
# inherit pkgsUnstable;
# inherit (pkgsUnstable)
# libcamera
# webkitgtk
# webkitgtk_4_1
# webkitgtk_6_0
# ;
}; };
nixosConfigurations = { nixosConfigurations = {