diff options
| author | Yureka <yuka@yuka.dev> | 2022-09-26 17:13:14 +0200 |
|---|---|---|
| committer | Yureka <yuka@yuka.dev> | 2022-10-02 23:47:49 +0200 |
| commit | 499b26b7b8464238af0b0893c1319ed94425a7f0 (patch) | |
| tree | aea85c6c53625445d2ed44379d677ee15cb9e81b /pkgs/servers/web-apps/discourse | |
| parent | f949de4fbb5c5adb7f3ec085206f48a2efdd1d9a (diff) | |
discourse.assets: pass yarnOfflineCache as environment variable
Diffstat (limited to 'pkgs/servers/web-apps/discourse')
| -rw-r--r-- | pkgs/servers/web-apps/discourse/default.nix | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/pkgs/servers/web-apps/discourse/default.nix b/pkgs/servers/web-apps/discourse/default.nix index 5035407c48db0..5c53c12022693 100644 --- a/pkgs/servers/web-apps/discourse/default.nix +++ b/pkgs/servers/web-apps/discourse/default.nix @@ -159,15 +159,15 @@ let ]; }; - yarnOfflineCache = fetchYarnDeps { - yarnLock = src + "/app/assets/javascripts/yarn.lock"; - sha256 = "0s8cmy76xh4z9y932bjshmpyr04zn3yn62ld9174lks2j965qkbl"; - }; - assets = stdenv.mkDerivation { pname = "discourse-assets"; inherit version src; + yarnOfflineCache = fetchYarnDeps { + yarnLock = src + "/app/assets/javascripts/yarn.lock"; + sha256 = "0s8cmy76xh4z9y932bjshmpyr04zn3yn62ld9174lks2j965qkbl"; + }; + nativeBuildInputs = runtimeDeps ++ [ postgresql redis @@ -203,7 +203,7 @@ let export HOME=$NIX_BUILD_TOP/fake_home # Make yarn install packages from our offline cache, not the registry - yarn config --offline set yarn-offline-mirror ${yarnOfflineCache} + yarn config --offline set yarn-offline-mirror $yarnOfflineCache # Fixup "resolved"-entries in yarn.lock to match our offline cache ${fixup_yarn_lock}/bin/fixup_yarn_lock app/assets/javascripts/yarn.lock @@ -261,10 +261,6 @@ let runHook postInstall ''; - - passthru = { - inherit yarnOfflineCache; - }; }; discourse = stdenv.mkDerivation { |