diff --git a/hosts/modules/gui/default.nix b/hosts/modules/gui/default.nix index e8dc81ad..5787c560 100644 --- a/hosts/modules/gui/default.nix +++ b/hosts/modules/gui/default.nix @@ -39,6 +39,7 @@ "koreader" "lemoa" # lemmy app # "lollypop" + "mate.engrampa" # archive manager "mepo" # maps viewer "mpv" # "networkmanagerapplet" @@ -71,7 +72,7 @@ # "gajim" # XMPP client "gimp" # broken on phosh "gnome.dconf-editor" - "gnome.file-roller" + # "gnome.file-roller" "gnome.gnome-disk-utility" "gnome.nautilus" # file browser # "gnome.totem" # video player, supposedly supports UPnP diff --git a/modules/programs.nix b/modules/programs.nix index 4303b10e..66d279d8 100644 --- a/modules/programs.nix +++ b/modules/programs.nix @@ -231,6 +231,7 @@ in (lib.mapAttrs' (pkgName: _pkg: { name = "cacert.${pkgName}"; value = {}; }) pkgs.cacert) (lib.mapAttrs' (pkgName: _pkg: { name = "gnome.${pkgName}"; value = {}; }) pkgs.gnome) (lib.mapAttrs' (pkgName: _pkg: { name = "libsForQt5.${pkgName}"; value = {}; }) pkgs.libsForQt5) + (lib.mapAttrs' (pkgName: _pkg: { name = "mate.${pkgName}"; value = {}; }) pkgs.mate) (lib.mapAttrs' (pkgName: _pkg: { name = "plasma5Packages.${pkgName}"; value = {}; }) pkgs.plasma5Packages) (lib.mapAttrs' (pkgName: _pkg: { name = "python3Packages.${pkgName}"; value = {}; }) pkgs.python3Packages) (lib.mapAttrs' (pkgName: _pkg: { name = "sane-scripts.${pkgName}"; value = {}; }) pkgs.sane-scripts) diff --git a/nixpatches/list.nix b/nixpatches/list.nix index 1d97fe8a..af3d0728 100644 --- a/nixpatches/list.nix +++ b/nixpatches/list.nix @@ -360,6 +360,13 @@ in [ hash = "sha256-PDCp4GOm6hWcRob4kz7qXZfxAF6YbYrESx9idoS3e/s="; }) + (fetchpatch' { + # TODO(2023/08/06): upstream. the closure looks fine + title = "mate.engrampa: support cross compilation"; + saneCommit = "3c76cdaf837f48861e4c3347b480c9a18b5b4a72"; + hash = "sha256-+4VhCmIpuM9opRhCvPsB7XYVQdHbdCTqlYsizbHga7Y="; + }) + (fetchpatch' { title = "dtrx: 8.5.1 -> 8.5.3"; prUrl = "https://github.com/NixOS/nixpkgs/pull/246282";