cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

emscriptenStdenv: fix cache location

Browse source
This commit is contained in:
Will Cohen 2022-05-09 10:56:23 -04:00
parent 15c43ea9ee
commit b5f228c836
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
pkgs/development/em-modules/generic/default.nix
View file

@ -1,4 +1,4 @@
{ pkgs, lib, emscripten, python2 }: { pkgs, lib, emscripten, python3 }:
{ buildInputs ? [], nativeBuildInputs ? [] { buildInputs ? [], nativeBuildInputs ? []
@ -12,8 +12,8 @@ pkgs.stdenv.mkDerivation (
pname = "emscripten-${lib.getName args}"; pname = "emscripten-${lib.getName args}";
version = lib.getVersion args; version = lib.getVersion args;
buildInputs = [ emscripten python2 ] ++ buildInputs; buildInputs = [ emscripten python3 ] ++ buildInputs;
nativeBuildInputs = [ emscripten python2 ] ++ nativeBuildInputs; nativeBuildInputs = [ emscripten python3 ] ++ nativeBuildInputs;
# fake conftest results with emscripten's python magic # fake conftest results with emscripten's python magic
EMCONFIGURE_JS=2; EMCONFIGURE_JS=2;
@ -25,6 +25,9 @@ pkgs.stdenv.mkDerivation (
emconfigure ./configure --prefix=$out emconfigure ./configure --prefix=$out
mkdir -p .emscriptencache
export EM_CACHE=$(pwd)/.emscriptencache
runHook postConfigure runHook postConfigure
''; '';
@ -32,6 +35,7 @@ pkgs.stdenv.mkDerivation (
runHook preBuild runHook preBuild
HOME=$TMPDIR HOME=$TMPDIR
emmake make emmake make
runHook postBuild runHook postBuild