colin/nix-files
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

overlays/cross: remove the unused iotas patch (which probably doesnt work anyway)

Browse Source
This commit is contained in:
Colin
2024-12-19 21:11:55 +00:00
parent 1c25deabbb
commit 9047d72fe7
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
overlays/cross.nix
View File

@@ -177,7 +177,7 @@ in with final; {
# shell = runtimeShell; # shell = runtimeShell;
# }; # };
# 2024/11/19: upstreaming is blocked on samba (via gvfs/gnome-online-accounts/evolution-data-server) # 2024/12/19: upstreaming is unblocked
# fixes: "Exec format error: './calls-scan'" # fixes: "Exec format error: './calls-scan'"
calls = prev.calls.overrideAttrs (upstream: { calls = prev.calls.overrideAttrs (upstream: {
# TODO: try building with mesonEmulatorHook when i upstream this # TODO: try building with mesonEmulatorHook when i upstream this
@@ -322,7 +322,7 @@ in with final; {
# outputs = lib.remove "devdoc" upstream.outputs; # outputs = lib.remove "devdoc" upstream.outputs;
# }); # });
# 2024/12/16: upstreaming is blocked by evolution-data-server (itself blocked on gnome-online-accounts) # 2024/12/19: upstreaming is unblocked
geary = prev.geary.overrideAttrs (upstream: { geary = prev.geary.overrideAttrs (upstream: {
buildInputs = upstream.buildInputs ++ [ buildInputs = upstream.buildInputs ++ [
# glib # glib
@@ -421,15 +421,15 @@ in with final; {
# i2p = mvToNativeInputs [ ant gettext ] prev.i2p; # i2p = mvToNativeInputs [ ant gettext ] prev.i2p;
# 2024/08/12: upstreaming is blocked on lua, lpeg, pandoc, unicode-collation, etc # 2024/08/12: upstreaming is blocked on lua, lpeg, pandoc, unicode-collation, etc
iotas = prev.iotas.overrideAttrs (_: { # iotas = prev.iotas.overrideAttrs (_: {
# error: "<iotas> is not allowed to refer to the following paths: <build python>" # # error: "<iotas> is not allowed to refer to the following paths: <build python>"
# disallowedReferences = []; # # disallowedReferences = [];
postPatch = '' # postPatch = ''
# @PYTHON@ becomes the build python, but this file isn't executable anyway so shouldn't have a shebang # # @PYTHON@ becomes the build python, but this file isn't executable anyway so shouldn't have a shebang
substituteInPlace iotas/const.py.in \ # substituteInPlace iotas/const.py.in \
--replace-fail '#!@PYTHON@' "" # --replace-fail '#!@PYTHON@' ""
''; # '';
}); # });
# jellyfin-media-player = mvToBuildInputs # jellyfin-media-player = mvToBuildInputs
# [ libsForQt5.wrapQtAppsHook ] # this shouldn't be: but otherwise we get mixed qtbase deps # [ libsForQt5.wrapQtAppsHook ] # this shouldn't be: but otherwise we get mixed qtbase deps