Merge 5b30695 into b17cb54

build-aux/pkg.nix

@@ -139,11 +139,6 @@ in stdenv.mkDerivation (finalAttrs: {
     touch source/build-aux/rust_boilerplate.mk
   '';
 
-  preBuild = lib.optionalString stdenv.cc.isClang ''
-    substituteInPlace libtexpdf/dpxutil.c \
-      --replace "ASSERT(ht && ht->table && iter);" "ASSERT(ht && iter);"
-  '';
-
   # remove forbidden references to $TMPDIR
   preFixup = lib.optionalString stdenv.isLinux ''
     for f in "$out"/bin/*; do

flake.nix

@@ -82,6 +82,8 @@
             pkgs.luarocks
             # For commitlint git hook
             pkgs.yarn
+            # For npx
+            pkgs.nodejs
           ];
         };
       };
@@ -96,6 +98,11 @@
         sile-luajit = sile.override {
           lua = pkgs.luajit;
         };
+        sile-clang = sile.override {
+          lua = pkgs.luajit;
+          # Use the same clang version as Nixpkgs' rust clang stdenv
+          stdenv = pkgs.rustc.llvmPackages.stdenv;
+        };
       };
       defaultPackage = packages.sile-luajit;
       apps = rec {