diff --git a/mastodon.nix b/mastodon.nix index f52697e..ab865f2 100644 --- a/mastodon.nix +++ b/mastodon.nix @@ -3,15 +3,16 @@ let secrets = import ./secrets.nix; + mastodon-source = pkgs.callPackage "${toString pkgs.path}/pkgs/servers/mastodon/source.nix" {}; + mastodon-lor-sh = pkgs.mastodon.override { srcOverride = pkgs.applyPatches { src = pkgs.fetchgit { - url = "https://github.com/mastodon/mastodon.git"; - rev = "v${pkgs.mastodon.version}"; - # TODO get sha256 from nixpkgs/pkgs/servers/mastodon/source.nix - sha256 = "1c0mxz45pkgmyw81z025n1ps1dkdq92337h7sd865w2fbgmzg50l"; + url = mastodon-source.src.url; + rev = mastodon-source.src.rev; + sha256 = mastodon-source.src.outputHash; }; - patches = [ + patches = [ ./patches/logo.patch ./patches/app-icon.patch ./patches/logo-symbol-wordmark.patch @@ -28,12 +29,7 @@ let ./patches/simple-form.patch ./patches/not-so-scary-500.patch - # https://github.com/NixOS/nixpkgs/pull/223547 - (pkgs.fetchpatch { - url = "https://github.com/mastodon/mastodon/commit/e7b81d7d9625893b1323e12215a2a98c0f19f58f.patch"; - hash = "sha256-cF0wtbjTNbsyqHb3uy5zYFaACIcziJ2ulJpOT5VoDO0="; - }) - ]; + ] ++ mastodon-source.src.patches; postPatch = (import ./branding.nix { pkgs = pkgs; }).branding; }; };