glycin-loaders: 0.1.2 → 1.0.1

https://gitlab.gnome.org/sophie-h/glycin/-/compare/0.1.2...1.0.1

Co-Authored-By: Bobby Rong <rjl931189261@126.com>

Changelog-Reviewed-By: Maxine Aubrey <max@ine.dev>
This commit is contained in:
Maxine Aubrey 2024-03-03 13:42:04 +01:00
parent a520545bb5
commit 8d57ba244c
No known key found for this signature in database
GPG Key ID: F6FE033DFCB899F7
2 changed files with 31 additions and 14 deletions

View File

@ -1,13 +1,24 @@
diff --git a/vendor/glycin/src/dbus.rs b/vendor/glycin/src/dbus.rs
index aa5a876..4f37420 100644
--- a/vendor/glycin/src/dbus.rs
+++ b/vendor/glycin/src/dbus.rs
@@ -43,7 +43,7 @@ impl<'a> DecoderProcess<'a> {
diff --git a/vendor/glycin/src/sandbox.rs b/vendor/glycin/src/sandbox.rs
index 7d00b36..aa70dc7 100644
--- a/vendor/glycin/src/sandbox.rs
+++ b/vendor/glycin/src/sandbox.rs
@@ -165,7 +165,7 @@ impl Sandbox {
let (bin, args, final_arg) = match sandbox_mechanism {
SandboxMechanism::Bwrap => (
- "bwrap".into(),
+ "@bwrap@".into(),
vec![
"--unshare-all",
"--die-with-parent",
args.push(self.command);
- ("bwrap".into(), args, Some(seccomp_memfd))
+ ("@bwrap@".into(), args, Some(seccomp_memfd))
}
SandboxMechanism::FlatpakSpawn => {
let memory_limit = Self::memory_limit();
@@ -233,8 +233,8 @@ impl Sandbox {
"/",
// Make /usr available as read only
"--ro-bind",
- "/usr",
- "/usr",
+ "/nix/store",
+ "/nix/store",
// Make tmpfs dev available
"--dev",
"/dev",

View File

@ -9,20 +9,23 @@
, ninja
, pkg-config
, rustc
, rustPlatform
, gtk4
, cairo
, libheif
, libxml2
, libseccomp
, libjxl
, gnome
}:
stdenv.mkDerivation (finalAttrs: {
pname = "glycin-loaders";
version = "0.1.2";
version = "1.0.1";
src = fetchurl {
url = "mirror://gnome/sources/glycin-loaders/${lib.versions.majorMinor finalAttrs.version}/glycin-loaders-${finalAttrs.version}.tar.xz";
hash = "sha256-x2wBklq9BwF0WJzLkWpEpXOrZbHp1JPxVOQnVkMebdc=";
hash = "sha256-0PAiRi/1VYVuheqUBHRHC7NrN8n/y8umOgP+XpVDcM8=";
};
patches = [
@ -40,6 +43,7 @@ stdenv.mkDerivation (finalAttrs: {
ninja
pkg-config
rustc
rustPlatform.bindgenHook # for libheif-sys
];
buildInputs = [
@ -47,6 +51,8 @@ stdenv.mkDerivation (finalAttrs: {
cairo
libheif
libxml2 # for librsvg crate
libseccomp
libjxl
];
passthru = {