Commit 1d47cfbf authored by Vladimir Pouzanov's avatar Vladimir Pouzanov
Browse files

mastodon: easier build patching

parent 2cc73b2b

pkgs/servers/mastodon/default.nix

+2 −1
Original line number Diff line number Diff line
@@ -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

}:

pkgs/servers/mastodon/source.nix

+2 −2
Original line number Diff line number Diff line 
# 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=";

pkgs/servers/mastodon/update.sh

+2 −2
Original line number Diff line number Diff line
@@ -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=";