engrampa: patch the package via sane.programs, not nixpkgs overlay
This commit is contained in:
parent
7c461cee2f
commit
f680a4a25c
|
@ -612,19 +612,6 @@ in
|
||||||
|
|
||||||
lua = {};
|
lua = {};
|
||||||
|
|
||||||
"mate.engrampa".packageUnwrapped = pkgs.rmDbusServices pkgs.mate.engrampa;
|
|
||||||
"mate.engrampa".sandbox.method = "bwrap"; # TODO:sandbox: untested
|
|
||||||
"mate.engrampa".sandbox.whitelistWayland = true;
|
|
||||||
"mate.engrampa".sandbox.autodetectCliPaths = "existingOrParent";
|
|
||||||
"mate.engrampa".sandbox.extraHomePaths = [
|
|
||||||
"archive"
|
|
||||||
"Books/local"
|
|
||||||
"Books/servo"
|
|
||||||
"records"
|
|
||||||
"ref"
|
|
||||||
"tmp"
|
|
||||||
];
|
|
||||||
|
|
||||||
mercurial.sandbox.method = "bwrap"; # TODO:sandbox: untested
|
mercurial.sandbox.method = "bwrap"; # TODO:sandbox: untested
|
||||||
mercurial.sandbox.net = "clearnet";
|
mercurial.sandbox.net = "clearnet";
|
||||||
mercurial.sandbox.whitelistPwd = true;
|
mercurial.sandbox.whitelistPwd = true;
|
||||||
|
|
|
@ -27,6 +27,7 @@
|
||||||
./dino.nix
|
./dino.nix
|
||||||
./dissent.nix
|
./dissent.nix
|
||||||
./element-desktop.nix
|
./element-desktop.nix
|
||||||
|
./engrampa.nix
|
||||||
./epiphany.nix
|
./epiphany.nix
|
||||||
./evince.nix
|
./evince.nix
|
||||||
./fcitx5.nix
|
./fcitx5.nix
|
||||||
|
|
|
@ -0,0 +1,26 @@
|
||||||
|
{ lib, pkgs, ... }:
|
||||||
|
{
|
||||||
|
sane.programs."mate.engrampa" = {
|
||||||
|
packageUnwrapped = pkgs.rmDbusServices (pkgs.mate.engrampa.overrideAttrs (upstream: {
|
||||||
|
src = lib.warnIf (upstream.version != "1.26.1") "engrampa package pin is outdated" (pkgs.fetchFromGitHub {
|
||||||
|
owner = "mate-desktop";
|
||||||
|
repo = "engrampa";
|
||||||
|
# point to a version > 1.27.0, for working cross compilation.
|
||||||
|
# remove this override once engrampa > 1.27.0 is released.
|
||||||
|
rev = "45f52c13baa93857d912effb4f1f9a58c41a0da3";
|
||||||
|
hash = "sha256-j7tASMjBSA+d1a9Fu3G/328aRDqNJjXoITxogRH0YI4=";
|
||||||
|
});
|
||||||
|
}));
|
||||||
|
sandbox.method = "bwrap"; # TODO:sandbox: untested
|
||||||
|
sandbox.whitelistWayland = true;
|
||||||
|
sandbox.autodetectCliPaths = "existingOrParent";
|
||||||
|
sandbox.extraHomePaths = [
|
||||||
|
"archive"
|
||||||
|
"Books/local"
|
||||||
|
"Books/servo"
|
||||||
|
"records"
|
||||||
|
"ref"
|
||||||
|
"tmp"
|
||||||
|
];
|
||||||
|
};
|
||||||
|
}
|
|
@ -118,8 +118,6 @@ let
|
||||||
|
|
||||||
browserpass = callPackage ./patched/browserpass { inherit (unpatched) browserpass; };
|
browserpass = callPackage ./patched/browserpass { inherit (unpatched) browserpass; };
|
||||||
|
|
||||||
engrampa = callPackage ./patched/engrampa { inherit (unpatched) mate; };
|
|
||||||
|
|
||||||
# mozilla keeps nerfing itself and removing configuration options
|
# mozilla keeps nerfing itself and removing configuration options
|
||||||
firefox-unwrapped = callPackage ./patched/firefox-unwrapped { inherit (unpatched) firefox-unwrapped; };
|
firefox-unwrapped = callPackage ./patched/firefox-unwrapped { inherit (unpatched) firefox-unwrapped; };
|
||||||
|
|
||||||
|
|
|
@ -1,15 +0,0 @@
|
||||||
{ mate
|
|
||||||
, fetchFromGitHub
|
|
||||||
, lib
|
|
||||||
}:
|
|
||||||
mate.engrampa.overrideAttrs (super: {
|
|
||||||
pname = "engrampa-sane";
|
|
||||||
src = lib.warnIf (super.version != "1.26.1") "engrampa package pin is outdated" (fetchFromGitHub {
|
|
||||||
owner = "mate-desktop";
|
|
||||||
repo = "engrampa";
|
|
||||||
# point to a version > 1.27.0, for working cross compilation.
|
|
||||||
# remove this override once engrampa > 1.27.0 is released.
|
|
||||||
rev = "45f52c13baa93857d912effb4f1f9a58c41a0da3";
|
|
||||||
hash = "sha256-j7tASMjBSA+d1a9Fu3G/328aRDqNJjXoITxogRH0YI4=";
|
|
||||||
});
|
|
||||||
})
|
|
Loading…
Reference in New Issue