diff options
| author | Rick van Schijndel <Mindavi@users.noreply.github.com> | 2023-11-21 07:48:09 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-21 07:48:09 +0100 |
| commit | b805e6d722f0cd25c5a96da99ddb3afcf09221b0 (patch) | |
| tree | 2db568eda0644fc668d77dc9289ba3dc76c40f26 /pkgs | |
| parent | 08b4f838124f895b1979c7dfd7363944f945c6bd (diff) | |
| parent | 1d47cfbf65c57cfd03db57b48d7b1386a74a0286 (diff) | |
Merge pull request #268551 from farcaller/mastodon
mastodon: easier build patching
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/servers/mastodon/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/servers/mastodon/source.nix | 4 | ||||
| -rwxr-xr-x | pkgs/servers/mastodon/update.sh | 4 |
3 files changed, 6 insertions, 5 deletions
diff --git a/pkgs/servers/mastodon/default.nix b/pkgs/servers/mastodon/default.nix index 7b20fe7038f94..0fa099881d967 100644 --- a/pkgs/servers/mastodon/default.nix +++ b/pkgs/servers/mastodon/default.nix @@ -6,8 +6,9 @@ # Allow building a fork or custom version of Mastodon: , pname ? "mastodon" , version ? srcOverride.version +, patches ? [] # src is a package -, srcOverride ? callPackage ./source.nix {} +, srcOverride ? callPackage ./source.nix { inherit patches; } , gemset ? ./. + "/gemset.nix" , yarnHash ? srcOverride.yarnHash }: diff --git a/pkgs/servers/mastodon/source.nix b/pkgs/servers/mastodon/source.nix index fd1101238a319..4f39e350a0f03 100644 --- a/pkgs/servers/mastodon/source.nix +++ b/pkgs/servers/mastodon/source.nix @@ -1,5 +1,5 @@ # This file was generated by pkgs.mastodon.updateScript. -{ fetchFromGitHub, applyPatches }: +{ fetchFromGitHub, applyPatches, patches ? [] }: let version = "4.2.1"; in @@ -11,7 +11,7 @@ in rev = "v${version}"; hash = "sha256-SM9WdD+xpxo+gfBft9DARV6QjwNbF2Y9McVrrdDT3fw="; }; - patches = []; + patches = patches ++ []; }) // { inherit version; yarnHash = "sha256-qoLesubmSvRsXhKwMEWHHXcpcqRszqcdZgHQqnTpNPE="; diff --git a/pkgs/servers/mastodon/update.sh b/pkgs/servers/mastodon/update.sh index ab430315858e3..8e8350431e211 100755 --- a/pkgs/servers/mastodon/update.sh +++ b/pkgs/servers/mastodon/update.sh @@ -82,7 +82,7 @@ HASH=$(echo "$JSON" | jq -r .hash) cat > source.nix << EOF # This file was generated by pkgs.mastodon.updateScript. -{ fetchFromGitHub, applyPatches }: +{ fetchFromGitHub, applyPatches, patches ? [] }: let version = "$VERSION"; in @@ -94,7 +94,7 @@ in rev = "v\${version}"; hash = "$HASH"; }; - patches = [$PATCHES]; + patches = patches ++ [$PATCHES]; }) // { inherit version; yarnHash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA="; |