This was achieved using the following command:
sd 'wrapGAppsHook\b' wrapGAppsHook3 (rg -l 'wrapGAppsHook\b')
And then manually reverted the following changes:
- alias in top-level.nix
- function name in wrap-gapps-hook.sh
- comment in postFixup of at-spi2-core
- comment in gtk4
- comment in preFixup of 1password-gui/linux.nix
- comment in postFixup of qgis/unwrapped-ltr.nix and qgis/unwrapped.nix
- comment in postFixup of telegram-desktop
- comment in postFixup of fwupd
- buildCommand of mongodb-compass
- postFixup of xflux-gui
- comment in a patch in kdePackages.kde-gtk-config and plasma5Packages.kde-gtk-config
- description of programs.sway.wrapperFeatures.gtk NixOS option (manual rebuild)
The only part of zathura that won't cross compile is the tests.
Let's disable these so the binaries at least can be cross-built.
This commit also adds `check` to `buildInputs` and fixes the
reference to `sphinx`.
Co-authored-by: apfelkuchen6 <73002165+apfelkuchen6@users.noreply.github.com>
Co-authored-by: Artturi <Artturin@artturin.com>
The current package setup has two issues:
* You can only access `pkgs.zathura` which is the "final" derivation,
i.e. a wrapper. This is a problem if you want to apply a patch to
`zathura(1)` in an overlay. To make this a bit easier, I decided to
expose `zathuraPkgs` entirely and `zathura` is now
`zathuraPkgs.zathuraWrapper`.
With this change, patches can now be added like this:
```
with import ./. {
overlays = [
(self: super: {
zathura = super.zathura.override {
zathura_core = super.zathuraPkgs.zathura_core.overrideAttrs (_: {
patches = [
~/Projects/zathura/0001-Fix-remote-link-resolution-in-zathura.patch
];
});
};
})
];
};
zathura
```
* As soon as you open another window in `zathura` from `zathura` (e.g.
to follow a PDF-embedded link to another PDF), it currently fails
because `--plugins-dir=` isn't passed along. This is because `zathura`
uses `argv[0]`[1] to open another process and the GApps-wrapper inside
`zathuraPkgs.zathura_core` does a `exec -a "$0"` which isn't the
`bin/zathura` from the wrapper that appends `--plugins-dir=`:
```
execve("/nix/var/nix/profiles/per-user/ma27/home-manager-140-link/home-path/bin/zathura", ["/nix/var/nix/profiles/per-user/ma27/home-manager-140-link/home-path/bin/zathura", "/home/ma27/Documents/Uni/Studium/Notepad/Aktuell/Index.pdf"], 0x7ffd7a4bf4b0 /* 108 vars */) = 0
execve("/nix/store/2wjhxbgzcnn0qqdwqy0m01hw39dxwfmk-zathura-0.4.8-bin/bin/zathura", ["/nix/store/2wjhxbgzcnn0qqdwqy0m01hw39dxwfmk-zathura-0.4.8-bin/bin/zathura", "--plugins-dir=/nix/store/wcch63yzwykc9x5393dzjfdxsf80mrb8-zathura-with-plugins-0.4.8/lib/zathura", "/home/ma27/Documents/Uni/Studium/Notepad/Aktuell/Index.pdf"], 0x1442010 /* 107 vars */) = 0
execve("/nix/store/2wjhxbgzcnn0qqdwqy0m01hw39dxwfmk-zathura-0.4.8-bin/bin/.zathura-wrapped", ["/nix/store/2wjhxbgzcnn0qqdwqy0m01hw39dxwfmk-zathura-0.4.8-bin/bin/zathura", "--plugins-dir=/nix/store/wcch63yzwykc9x5393dzjfdxsf80mrb8-zathura-with-plugins-0.4.8/lib/zathura", "/home/ma27/Documents/Uni/Studium/Notepad/Aktuell/Index.pdf"], 0x81d010 /* 108 vars */) = 0
```
I figured it's way simpler to actually use the environment variable
`ZATHURA_PLUGINS_PATH` for that purpose as the environment is
inherited when a new process is started.
[1] 242329b534/zathura/links.c (L205-215)
The fish completion checks the plugin directory for supported file types
to complete. However the plugin dir checked was the one of the
zathura_core derivation which of course has no plugin dir. We now patch
up the referenced path in the wrapper derivation.
