about summary refs log tree commit diff
path: root/pkgs/top-level/static.nix
diff options
context:
space:
mode:
authorMatthew Bauer <mjbauer95@gmail.com>2019-01-29 21:01:24 -0500
committerMatthew Bauer <mjbauer95@gmail.com>2019-04-23 21:48:57 -0400
commit9abff4af4f07c16aecd89bf82051afbc3228d6fd (patch)
tree7a8d8fe316db1636819a43a28192da740ea835c8 /pkgs/top-level/static.nix
parent6088a4793f2a83921b197a9185034934fcd96d02 (diff)
downloadnixlib-9abff4af4f07c16aecd89bf82051afbc3228d6fd.tar
nixlib-9abff4af4f07c16aecd89bf82051afbc3228d6fd.tar.gz
nixlib-9abff4af4f07c16aecd89bf82051afbc3228d6fd.tar.bz2
nixlib-9abff4af4f07c16aecd89bf82051afbc3228d6fd.tar.lz
nixlib-9abff4af4f07c16aecd89bf82051afbc3228d6fd.tar.xz
nixlib-9abff4af4f07c16aecd89bf82051afbc3228d6fd.tar.zst
nixlib-9abff4af4f07c16aecd89bf82051afbc3228d6fd.zip
wasm: init cross target
Adds pkgsCross.wasm32 and pkgsCross.wasm64. Use it to build Nixpkgs
with a WebAssembly toolchain.

stdenv/cross: use static overlay on isWasm

isWasm doesn’t make sense dynamically linked.
Diffstat (limited to 'pkgs/top-level/static.nix')
-rw-r--r--pkgs/top-level/static.nix12
1 files changed, 12 insertions, 0 deletions
diff --git a/pkgs/top-level/static.nix b/pkgs/top-level/static.nix
index fe9c04de04cd..dea30fe7b595 100644
--- a/pkgs/top-level/static.nix
+++ b/pkgs/top-level/static.nix
@@ -148,4 +148,16 @@ in {
     };
   };
 
+  llvmPackages_8 = super.llvmPackages_8 // {
+    libraries = super.llvmPackages_8.libraries // rec {
+      libcxxabi = super.llvmPackages_8.libraries.libcxxabi.override {
+        enableShared = false;
+      };
+      libcxx = super.llvmPackages_8.libraries.libcxx.override {
+        enableShared = false;
+        inherit libcxxabi;
+      };
+    };
+  };
+
 }