diff options
| author | Okina Matara <okinan@chiru.no> | 2018-07-02 05:43:57 -0500 |
|---|---|---|
| committer | Okina Matara <okinan@chiru.no> | 2018-07-02 05:43:57 -0500 |
| commit | 3bec94f2e1e75c0d2bb08912ff7bc8c94fe9d779 (patch) | |
| tree | 7fd671df41365cafe7228522f4bd3d7885163578 /pkgs/servers/meguca/default.nix | |
| parent | 05a337ce533584de935de1e331db92f2a86d5b7c (diff) | |
| download | nixpkgs-3bec94f2e1e75c0d2bb08912ff7bc8c94fe9d779.tar nixpkgs-3bec94f2e1e75c0d2bb08912ff7bc8c94fe9d779.tar.gz nixpkgs-3bec94f2e1e75c0d2bb08912ff7bc8c94fe9d779.tar.bz2 nixpkgs-3bec94f2e1e75c0d2bb08912ff7bc8c94fe9d779.tar.lz nixpkgs-3bec94f2e1e75c0d2bb08912ff7bc8c94fe9d779.tar.xz nixpkgs-3bec94f2e1e75c0d2bb08912ff7bc8c94fe9d779.tar.zst nixpkgs-3bec94f2e1e75c0d2bb08912ff7bc8c94fe9d779.zip | |
meguca: Disable building C++ client for Darwin
Diffstat (limited to 'pkgs/servers/meguca/default.nix')
| -rw-r--r-- | pkgs/servers/meguca/default.nix | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/pkgs/servers/meguca/default.nix b/pkgs/servers/meguca/default.nix index f8bad09e711..67b2685262d 100644 --- a/pkgs/servers/meguca/default.nix +++ b/pkgs/servers/meguca/default.nix @@ -1,6 +1,5 @@ -{ stdenv, buildGoPackage, fetchgit, pkgconfig, cmake, libcxx, libcxxabi -, ffmpeg-full, graphicsmagick, ghostscript, quicktemplate, go-bindata, easyjson -, nodePackages, emscripten }: +{ stdenv, buildGoPackage, fetchgit, pkgconfig, cmake, ffmpeg-full, ghostscript +, graphicsmagick, quicktemplate, go-bindata, easyjson, nodePackages, emscripten }: buildGoPackage rec { name = "meguca-unstable-${version}"; @@ -22,7 +21,7 @@ buildGoPackage rec { buildInputs = [ ffmpeg-full graphicsmagick ghostscript quicktemplate go-bindata easyjson emscripten - ] ++ stdenv.lib.optionals stdenv.isDarwin [ libcxx libcxxabi ]; + ]; buildPhase = '' export HOME=$PWD @@ -32,8 +31,10 @@ buildGoPackage rec { sed -i "/npm install --progress false --depth 0/d" Makefile make generate_clean go generate meguca/... - go build -p $NIX_BUILD_CORES meguca - make -j $NIX_BUILD_CORES client wasm + go build -v -p $NIX_BUILD_CORES meguca + make -j $NIX_BUILD_CORES client + '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' + make -j $NIX_BUILD_CORES wasm ''; installPhase = '' |