diff options
Diffstat (limited to 'pkgs/webapps/mastodon')
-rw-r--r-- | pkgs/webapps/mastodon/default.nix | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/pkgs/webapps/mastodon/default.nix b/pkgs/webapps/mastodon/default.nix index 3769b67f..ce015c5d 100644 --- a/pkgs/webapps/mastodon/default.nix +++ b/pkgs/webapps/mastodon/default.nix | |||
@@ -1,15 +1,16 @@ | |||
1 | { varDir ? "/var/lib/mastodon", mylibs, | 1 | { varDir ? "/var/lib/mastodon", mylibs, |
2 | stdenv, writeText, runCommand, | 2 | stdenv, writeText, runCommand, |
3 | ruby_2_6, bundlerEnv, defaultGemConfig, | 3 | ruby_2_6, bundlerEnv, defaultGemConfig, |
4 | jq, protobuf, protobufc, pkgconfig, libidn, pam, nodejs, yarn }: | 4 | jq, protobuf, protobufc, pkgconfig, libidn, pam, nodejs, yarn, yarn2nix-moretea }: |
5 | let | 5 | let |
6 | info = mylibs.fetchedGithub ./mastodon.json // { | 6 | info = mylibs.fetchedGithub ./mastodon.json // { |
7 | src= runCommand "mastodon-patched" { | 7 | src = runCommand "mastodon-patched" { |
8 | source = (mylibs.fetchedGithub ./mastodon.json).src; | 8 | source = (mylibs.fetchedGithub ./mastodon.json).src; |
9 | } '' | 9 | } '' |
10 | cp -a $source $out | 10 | cp -a $source $out |
11 | chmod -R u+w $out | 11 | chmod -R u+w $out |
12 | sed -i -e "/fuubar/s/2.4.0/2.4.1/" $out/Gemfile.lock | 12 | sed -i -e "/fuubar/s/2.4.0/2.4.1/" $out/Gemfile.lock |
13 | sed -i -e "s/ff00dc470b5b2d9f145a6d6e977a54de5df2b4c9/ff00dc470b5b2d9f145a6d6e977a54de5df2b4c9#4255dc41fa7df9c3a02c1595f058e248bc37b784/" $out/yarn.lock | ||
13 | ''; | 14 | ''; |
14 | }; | 15 | }; |
15 | gems = bundlerEnv { | 16 | gems = bundlerEnv { |
@@ -45,7 +46,7 @@ let | |||
45 | cat ${info.src}/package.json | jq -r '.version = "${info.version}"' > $out | 46 | cat ${info.src}/package.json | jq -r '.version = "${info.version}"' > $out |
46 | ''; | 47 | ''; |
47 | in | 48 | in |
48 | mylibs.yarn2nixPackage.mkYarnModules rec { | 49 | yarn2nix-moretea.mkYarnModules rec { |
49 | name = "mastodon-yarn"; | 50 | name = "mastodon-yarn"; |
50 | pname = name; | 51 | pname = name; |
51 | version = info.version; | 52 | version = info.version; |
@@ -53,9 +54,6 @@ let | |||
53 | yarnLock = "${info.src}/yarn.lock"; | 54 | yarnLock = "${info.src}/yarn.lock"; |
54 | yarnNix = ./yarn-packages.nix; | 55 | yarnNix = ./yarn-packages.nix; |
55 | pkgConfig = { | 56 | pkgConfig = { |
56 | all = { | ||
57 | buildInputs = [ mylibs.yarn2nixPackage.src ]; | ||
58 | }; | ||
59 | uws = { | 57 | uws = { |
60 | postInstall = '' | 58 | postInstall = '' |
61 | npx node-gyp rebuild > build_log.txt 2>&1 || true | 59 | npx node-gyp rebuild > build_log.txt 2>&1 || true |