diff options
| author | Yureka <yuka@yuka.dev> | 2021-08-07 13:26:45 +0200 |
|---|---|---|
| committer | Yureka <yuka@yuka.dev> | 2021-08-21 10:10:08 +0200 |
| commit | d7ac3b473afff8000338f1038e78a22556a5c4a3 (patch) | |
| tree | 4f18639d1e1d89506a5a04e0b390dcea00d9921f /pkgs/top-level/emscripten-packages.nix | |
| parent | 0d8f36923a50eeb318e1c81a22ac6eb80622d3f5 (diff) | |
emscriptenPackages.json_c: fix build
Co-authored-by: Alexander Khovansky <alex@khovansky.me>
Diffstat (limited to 'pkgs/top-level/emscripten-packages.nix')
| -rw-r--r-- | pkgs/top-level/emscripten-packages.nix | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/pkgs/top-level/emscripten-packages.nix b/pkgs/top-level/emscripten-packages.nix index 0d2197faae099..7cf60df98dbfd 100644 --- a/pkgs/top-level/emscripten-packages.nix +++ b/pkgs/top-level/emscripten-packages.nix @@ -10,12 +10,11 @@ rec { stdenv = pkgs.emscriptenStdenv; }).overrideDerivation (old: { - nativeBuildInputs = [ autoreconfHook pkg-config ]; + nativeBuildInputs = [ pkg-config cmake ]; propagatedBuildInputs = [ zlib ]; - buildInputs = old.buildInputs ++ [ automake autoconf ]; configurePhase = '' HOME=$TMPDIR - emconfigure ./configure --prefix=$out + emcmake cmake . $cmakeFlags -DCMAKE_INSTALL_PREFIX=$out -DCMAKE_INSTALL_INCLUDEDIR=$dev/include ''; checkPhase = '' echo "================= testing json_c using node =================" @@ -26,7 +25,7 @@ rec { `pkg-config zlib --cflags` \ `pkg-config zlib --libs` \ -I . \ - .libs/libjson-c.so \ + libjson-c.a \ -o ./test1.js echo "Using node to execute the test which basically outputs an error on stderr which we grep for" |