moby: replace file-roller with xarchiver

This commit is contained in:
Colin 2023-07-31 09:59:15 +00:00
parent 4e37f2c651
commit 8a367b718d
4 changed files with 14 additions and 1 deletions

View File

@ -40,6 +40,7 @@
./tangram.nix ./tangram.nix
./vlc.nix ./vlc.nix
./wireshark.nix ./wireshark.nix
./xarchiver.nix
./zeal.nix ./zeal.nix
./zsh ./zsh
]; ];

View File

@ -0,0 +1,7 @@
{ pkgs, ... }:
{
sane.programs.xarchiver.package = pkgs.xarchiver.override {
# unar doesn't cross compile well, so disable support for it
unar = null;
};
}

View File

@ -24,7 +24,7 @@
# "fractal" # matrix client # "fractal" # matrix client
# "gnome.cheese" # "gnome.cheese"
# "gnome-feeds" # RSS reader (with claimed mobile support) # "gnome-feeds" # RSS reader (with claimed mobile support)
"gnome.file-roller" # "gnome.file-roller"
# "gnome.gnome-maps" # works on phosh # "gnome.gnome-maps" # works on phosh
# "gnome-podcasts" # "gnome-podcasts"
# "gnome.gnome-system-monitor" # "gnome.gnome-system-monitor"
@ -69,6 +69,7 @@
"gajim" # XMPP client "gajim" # XMPP client
"gimp" # broken on phosh "gimp" # broken on phosh
"gnome.dconf-editor" "gnome.dconf-editor"
"gnome.file-roller"
"gnome.gnome-disk-utility" "gnome.gnome-disk-utility"
"gnome.nautilus" # file browser "gnome.nautilus" # file browser
# "gnome.totem" # video player, supposedly supports UPnP # "gnome.totem" # video player, supposedly supports UPnP
@ -94,6 +95,7 @@
suggestedPrograms = [ suggestedPrograms = [
"megapixels" # camera app "megapixels" # camera app
"portfolio-filemanager" "portfolio-filemanager"
"xarchiver"
]; ];
}; };

View File

@ -1398,4 +1398,7 @@ in {
# --replace "pkg-config" "$PKG_CONFIG" # --replace "pkg-config" "$PKG_CONFIG"
# ''; # '';
# }); # });
# 2023/07/30: upstreaming is blocked on unar (gnustep), unless i also make that optional
xarchiver = mvToNativeInputs [ final.libxslt ] prev.xarchiver;
} }