python3Packages.craft-providers: update snap injection patch to use beta for all crafts

This commit is contained in:
Jon Seager 2024-04-18 18:05:27 +01:00
parent bc91f07f9b
commit a9c1e0b990
No known key found for this signature in database
2 changed files with 6 additions and 1 deletions

View File

@ -33,6 +33,11 @@ buildPythonPackage rec {
};
patches = [
# This lib will try to inject snaps *from the host system* into the build
# system. This patch short-circuits that logic and ensures that snaps are
# installed on the build system from the snap store - because there is no
# snapd on NixOS hosts that can be used for the injection. This patch will
# likely never be accepted upstream.
./inject-snaps.patch
];

View File

@ -38,7 +38,7 @@ index 3c914a2..d9c2cf9 100644
- details=error.details,
- ) from error
+ try:
+ channel = "latest/edge" if snap.name == "rockcraft" else "latest/stable"
+ channel = "latest/beta"
+ snap_installer.install_from_store(
+ executor=executor,
+ snap_name=snap.name,