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

Compare commits

base: wizbos-pub:924661d9fc3b57790bd0634cbf2da070c4074946
Branches Tags
wizbos-pub:master
..
compare: wizbos-pub:98176397b5623d11af3e1fe2591ecc8da3ac0407
Branches Tags
wizbos-pub:master

No commits in common. "924661d9fc3b57790bd0634cbf2da070c4074946" and "98176397b5623d11af3e1fe2591ecc8da3ac0407" have entirely different histories.
924661d9fc ... 98176397b5

3 changed files with 164 additions and 250 deletions
Show Stats Expand all files Collapse all files

47
default.nix
View File

@ -1,7 +1,23 @@
pkgs: inputs:
let
pnpm2nix = pkgs.callPackage inputs.pnpm2nix { };
{ pkgs
, google-chrome
, symlinkJoin
, stdenv
, elmPackages
, libjpeg
, optipng
, pngquant
, libwebp
, pnpm2nix ? pkgs.callPackage (
builtins.fetchGit {
url = "https://github.com/nix-community/pnpm2nix.git";
rev = "f67be0925a91b92f54d99dbdead7a06920b979ac";
}
) {}
, ...
}:
let
nodeCleanSourceFilter = name: type:
pkgs.lib.cleanSourceFilter name type
&& ((baseNameOf name) != "node_modules");
@ -36,8 +52,8 @@ let
# Make sure that directory exists
mkdir -p $local_chromium
# Link pkgs' standard google chrome into place
cp -r --no-preserve=mode,ownership ${pkgs.google-chrome}/share/google/chrome $local_chromium/chrome-linux
cp ${pkgs.google-chrome}/bin/google-chrome-stable $local_chromium/chrome-linux/chrome
cp -r --no-preserve=mode,ownership ${google-chrome}/share/google/chrome $local_chromium/chrome-linux
cp ${google-chrome}/bin/google-chrome-stable $local_chromium/chrome-linux/chrome
chmod +x $local_chromium/chrome-linux/chrome
'';
}
@ -54,7 +70,7 @@ let
oldAttrs: {
preBuild = ''
mkdir -p $HOME/node_modules/pngquant-bin/vendor
ln -s ${pkgs.pngquant}/bin/pngquant $HOME/node_modules/pngquant-bin/vendor/pngquant
ln -s ${pngquant}/bin/pngquant $HOME/node_modules/pngquant-bin/vendor/pngquant
'';
}
)
@ -70,28 +86,28 @@ let
);
optipng =
(drv: drv.overrideAttrs (oldAttrs: { buildInputs = [ pkgs.optipng ]; }));
(drv: drv.overrideAttrs (oldAttrs: { buildInputs = [ optipng ]; }));
optipng-bin = (
drv:
drv.overrideAttrs (
oldAttrs: {
preBuild = ''
mkdir -p $HOME/node_modules/optipng-bin/vendor
ln -s ${pkgs.optipng}/bin/optipng $HOME/node_modules/optipng-bin/vendor/optipng
ln -s ${optipng}/bin/optipng $HOME/node_modules/optipng-bin/vendor/optipng
'';
}
)
);
jpegtran =
(drv: drv.overrideAttrs (oldAttrs: { buildInputs = [ pkgs.libjpeg ]; }));
(drv: drv.overrideAttrs (oldAttrs: { buildInputs = [ libjpeg ]; }));
jpegtran-bin = (
drv:
drv.overrideAttrs (
oldAttrs: {
preBuild = ''
mkdir -p $HOME/node_modules/jpegtran-bin/vendor
ln -s ${pkgs.libjpeg}/bin/jpegtran $HOME/node_modules/jpegtran-bin/vendor/jpegtran
ln -s ${libjpeg}/bin/jpegtran $HOME/node_modules/jpegtran-bin/vendor/jpegtran
'';
}
)
@ -103,7 +119,7 @@ let
oldAttrs: {
buildPhase = ''
mkdir -p $HOME/node_modules/cwebp-bin/vendor/
ln -s ${pkgs.libwebp}/bin/cwebp $HOME/node_modules/cwebp-bin/vendor/cwebp
ln -s ${libwebp}/bin/cwebp $HOME/node_modules/cwebp-bin/vendor/cwebp
'';
}
)
@ -125,7 +141,7 @@ let
, extraPostBody ? ""
}:
let
nodeSource = pkgs.symlinkJoin {
nodeSource = symlinkJoin {
name = "${name}-node-sources";
paths = [ builderPkg.lib ] ++ nodePackages;
};
@ -197,13 +213,12 @@ let
${extraPostBody}
</html>
'';
in
pkgs.stdenv.mkDerivation {
in stdenv.mkDerivation {
inherit name;
src = elmCleanSource src;
buildInputs = with pkgs.elmPackages; [ elm nodeSource ];
buildInputs = with elmPackages; [ elm nodeSource ];
patchPhase = ''
ln -sf ${nodeSource}/node_modules .
@ -229,7 +244,7 @@ let
export NODE_PATH=$PWD/node_modules
'';
buildPhase = pkgs.elmPackages.fetchElmDeps {
buildPhase = elmPackages.fetchElmDeps {
elmPackages = import (src + "/elm-srcs.nix");
registryDat = src + "/registry.dat";
elmVersion = "0.19.1";

77
flake.lock generated
View File

@ -1,77 +0,0 @@
{
"nodes": {
"flake-compat": {
"flake": false,
"locked": {
"lastModified": 1606424373,
"narHash": "sha256-oq8d4//CJOrVj+EcOaSXvMebvuTkmBJuT5tzlfewUnQ=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "99f1c2157fba4bfe6211a321fd0ee43199025dbf",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"nixpkgs": {
"locked": {
"lastModified": 1612996220,
"narHash": "sha256-l2kzWXxL3vXr8VxUzRtORPJS0nFQ3E5kBPF/AYAK0wI=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "758b29b5a28b818e311ad540637a5c1e40867489",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"pnpm2nix": {
"flake": false,
"locked": {
"lastModified": 1613295715,
"narHash": "sha256-bj4daCwh8AerFz65yUYRBkJTdP+PdvGKNozdbAdHiUI=",
"ref": "master",
"rev": "55487e9b92017d9cadf7e6ed4c090e15e7eaf8a9",
"revCount": 88,
"type": "git",
"url": "ssh://git@github.com/notgne2/pnpm2nix.git"
},
"original": {
"type": "git",
"url": "ssh://git@github.com/notgne2/pnpm2nix.git"
}
},
"root": {
"inputs": {
"flake-compat": "flake-compat",
"nixpkgs": "nixpkgs",
"pnpm2nix": "pnpm2nix",
"utils": "utils"
}
},
"utils": {
"locked": {
"lastModified": 1610051610,
"narHash": "sha256-U9rPz/usA1/Aohhk7Cmc2gBrEEKRzcW4nwPWMPwja4Y=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "3982c9903e93927c2164caa727cd3f6a0e6d14cc",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
}
},
"root": "root",
"version": 7
}

24
flake.nix
View File

@ -1,24 +0,0 @@
{
inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
pnpm2nix.url = "git+ssh://git@github.com/notgne2/pnpm2nix.git";
pnpm2nix.flake = false;
utils.url = "github:numtide/flake-utils";
flake-compat = {
url = "github:edolstra/flake-compat";
flake = false;
};
};
outputs = { self, nixpkgs, utils, ... } @ inputs:
utils.lib.eachDefaultSystem (system:
let
pkgs = import nixpkgs { inherit system; };
in
{
lib = import ./default.nix pkgs inputs;
});
}