replace unar with dtrx
the former is costly to (cross-)compile
This commit is contained in:
parent
9ca8c74ed7
commit
ae9a81919f
|
@ -72,6 +72,7 @@
|
|||
# "cdrtools"
|
||||
"clinfo"
|
||||
"dmidecode"
|
||||
"dtrx" # `unar` alternative, "Do The Right eXtraction"
|
||||
"efivar"
|
||||
# "flashrom"
|
||||
"fwupd"
|
||||
|
@ -106,7 +107,7 @@
|
|||
# "ssh-to-age"
|
||||
"sudo"
|
||||
# "tageditor" # music tagging
|
||||
"unar"
|
||||
# "unar"
|
||||
"wireguard-tools"
|
||||
"xdg-terminal-exec"
|
||||
"xdg-utils" # for xdg-open
|
||||
|
|
|
@ -264,6 +264,17 @@ in [
|
|||
hash = "sha256-fAZpduh3JZeFixJ4yX0wkh/GRp0gYKsTT+XkNdpK7CU=";
|
||||
})
|
||||
|
||||
(fetchpatch' {
|
||||
title = "dtrx: 8.5.1 -> 8.5.3";
|
||||
saneCommit = "eba9bbc251db942ae27f87824cae643b5f3198c2";
|
||||
hash = "sha256-wgpjUXQ/ZnRY5AJ9xOL2BToA7hDaokDiMmPkMt0Y5go=";
|
||||
})
|
||||
(fetchpatch' {
|
||||
title = "dtrx: don't double-wrap the binary";
|
||||
saneCommit = "97a9d12b6c31a58e9067eae7cdcd3f53055c124c";
|
||||
hash = "sha256-g+p96OrBOQAwwH7nwHBuM/KGeIrnBzh9u9lL0M0sYWo=";
|
||||
})
|
||||
|
||||
# (fetchpatch' {
|
||||
# # N.B.: compiles, but runtime error on launch suggestive of some module not being shipped
|
||||
# title = "matrix-appservice-irc: 0.38.0 -> 1.0.0";
|
||||
|
|
|
@ -1212,6 +1212,13 @@ in {
|
|||
# rmlint is scons; it reads the CC environment variable, though, so *may* be cross compilable
|
||||
inherit (emulated) stdenv;
|
||||
};
|
||||
rpm = prev.rpm.overrideAttrs (upstream: {
|
||||
# fixes "python too old". might also be specifiable as a configure flag?
|
||||
env = upstream.env // {
|
||||
PYTHON = final.python3.interpreter;
|
||||
};
|
||||
});
|
||||
|
||||
# samba = prev.samba.overrideAttrs (_upstream: {
|
||||
# # we get "cannot find C preprocessor: aarch64-unknown-linux-gnu-cpp", but ONLY when building with the ccache stdenv.
|
||||
# # this solves that, but `CPP` must be a *single* path -- not an expression.
|
||||
|
|
Loading…
Reference in New Issue