komikku: use unpatched upstream now that my fix is in a release

This commit is contained in:
Colin 2023-08-17 00:01:15 +00:00
parent ff65a697a9
commit a1f79dc18a
3 changed files with 1 additions and 24 deletions

View File

@ -889,9 +889,7 @@ in {
./kitty-no-docs.patch
];
});
komikku = prev.komikku.override {
komikku = wrapGAppsHook4Fix prev.komikku.unpatched;
};
komikku = wrapGAppsHook4Fix prev.komikku;
koreader = (prev.koreader.override {
# fixes runtime error: luajit: ./ffi/util.lua:757: attempt to call field 'pack' (a nil value)
# inherit (emulated) luajit;

View File

@ -112,8 +112,6 @@ let
# jackett doesn't allow customization of the bind address: this will probably always be here.
jackett = callPackage ./patched/jackett { inherit (unpatched) jackett; };
komikku = callPackage ./patched/komikku { inherit (unpatched) komikku; };
phoc = callPackage ./patched/phoc { inherit (unpatched) phoc; };

View File

@ -1,19 +0,0 @@
{ komikku
, fetchFromGitLab
, fetchpatch2
}:
komikku.overrideAttrs (upstream: {
# src = fetchFromGitLab {
# owner = "valos";
# repo = "Komikku";
# rev = "7dcf2b3d0ba685396872780b1ce75d01cbe02ebe";
# hash = "sha256-LzgHPuIpxy0ropiNycdxZP6onjK2JpMRqkkdmJGA4nE=";
# };
patches = (upstream.patches or []) ++ [
(fetchpatch2 {
url = "https://git.uninsane.org/colin/mirror-komikku/commit/318fc0c975ba84ca4dcff405bc1bb8f5895bc5a6.diff";
hash = "sha256-mn81hCt5xrypJMOOiCOg8NthLjglXntTDsYpcdCg0E8=";
})
];
passthru.unpatched = komikku;
})