wizbos-pub/wand-front-utils
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

icons should be icon.png, fix for 0.19.1

Browse Source
This commit is contained in:
notgne2 2020-02-12 18:35:05 -07:00
parent 9d281ec79f
commit c1130a6759
2 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
default.nix
View File

@ -14,15 +14,6 @@ let
((baseNameOf name) != "elm-stuff" && (baseNameOf name) != "dist"); ((baseNameOf name) != "elm-stuff" && (baseNameOf name) != "dist");
elmCleanSource = src: pkgs.lib.cleanSourceWith { filter = elmCleanSourceFilter; inherit src; }; elmCleanSource = src: pkgs.lib.cleanSourceWith { filter = elmCleanSourceFilter; inherit src; };
scrapeNodeDeps = nodePkg:
let
nodeDeps = (builtins.filter (x: builtins.hasAttr "nodejs" x) nodePkg.buildInputs);
in
pkgs.lib.unique (nodeDeps ++ builtins.concatLists (map scrapeNodeDeps nodeDeps));
findNodeDep = nodePkg: name:
(builtins.elemAt 0 (builtins.filter (x: x.pname == name) (scrapeNodeDeps nodePkg)));
builderPkg = pnpm2nix.mkPnpmPackage { builderPkg = pnpm2nix.mkPnpmPackage {
name = "builder-node-packages"; name = "builder-node-packages";
packageJSON = ./package.json; packageJSON = ./package.json;
@ -84,7 +75,7 @@ let
themeColor ? "#000000", themeColor ? "#000000",
backgroundColor ? "#000000", backgroundColor ? "#000000",
src, src,
nodePackages ? null, nodePackages ? [],
routes ? [ "/" ], routes ? [ "/" ],
}: }:
let let
@ -92,7 +83,7 @@ let
name = "${name}-node-sources"; name = "${name}-node-sources";
paths = [ paths = [
builderPkg.lib builderPkg.lib
] ++ (if nodePackages != null then [ nodePackages ] else [ ]); ] ++ nodePackages;
}; };
baseWebpackConfig = builtins.readFile ./webpack.config.js; baseWebpackConfig = builtins.readFile ./webpack.config.js;
@ -184,7 +175,8 @@ let
buildPhase = elmPackages.fetchElmDeps { buildPhase = elmPackages.fetchElmDeps {
elmPackages = import (src + "/elm-srcs.nix"); elmPackages = import (src + "/elm-srcs.nix");
versionsDat = src + "/versions.dat"; registryDat = src + "/registry.dat";
elmVersion = "0.19.1";
}; };
installPhase = '' installPhase = ''

2
webpack.config.js
View File

@ -132,7 +132,7 @@ module.exports = {
} }
}), }),
new FaviconsWebpackPlugin({ new FaviconsWebpackPlugin({
logo: path.join(__dirname, 'data', 'images', 'logo.png'), logo: path.join(__dirname, 'data', 'images', 'icon.png'),
inject: false, // manually in our template for now cos its fuckd inject: false, // manually in our template for now cos its fuckd
mode: 'webapp', mode: 'webapp',
prefix: 'appdata', prefix: 'appdata',