3
0
Fork 0
forked from mirrors/nixpkgs

lemmy-ui: use fetchyarndeps

lemmy: remove yarn.nix
This commit is contained in:
happysalada 2021-10-29 09:58:08 +09:00 committed by Raphael Megzari
parent c0b0059e8a
commit 9a3e6e2253
3 changed files with 11 additions and 9227 deletions

View file

@ -5,6 +5,7 @@
, python3
, pkg-config
, fetchFromGitHub
, fetchYarnDeps
}:
let
@ -21,8 +22,6 @@ let
name = "lemmy-ui";
version = "0.12.2";
in
mkYarnPackage {
src = fetchFromGitHub {
owner = "LemmyNet";
@ -31,12 +30,17 @@ mkYarnPackage {
fetchSubmodules = true;
sha256 = "sha256-iFLJqUnz4m9/JTSaJSUugzY5KkiKtH0sMYY4ALm2Ebk=";
};
in
mkYarnPackage {
inherit pkgConfig name version;
inherit src pkgConfig name version;
extraBuildInputs = [ libsass ];
yarnNix = ./yarn.nix;
offlineCache = fetchYarnDeps {
yarnLock = src + "/yarn.lock";
sha256 = "sha256-i12J+Qi7Nsjr5JipeRXdkFkh+I/ROsgRw4Vty2cMNyU=";
};
# Fails mysteriously on source/package.json
# Upstream package.json is missing a newline at the end
@ -71,4 +75,3 @@ mkYarnPackage {
platforms = platforms.linux;
};
}

File diff suppressed because it is too large Load diff

View file

@ -20707,7 +20707,9 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) Security;
};
lemmy-ui = callPackage ../servers/web-apps/lemmy/ui.nix { };
lemmy-ui = callPackage ../servers/web-apps/lemmy/ui.nix {
nodejs = nodejs-14_x;
};
lighttpd = callPackage ../servers/http/lighttpd { };