From 5b30695f4d5618e24aa9af2fbf5ea1b297ffadc5 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Sat, 7 Oct 2023 12:13:04 +0300
Subject: [PATCH] feat(tooling): Add nix packages building sile with clang

Co-authored-by: Caleb Maclennan <caleb@alerque.com>
---
 build-aux/pkg.nix | 5 -----
 flake.nix         | 5 +++++
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/build-aux/pkg.nix b/build-aux/pkg.nix
index 0951c40e8..f2ac5fa7f 100644
--- a/build-aux/pkg.nix
+++ b/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
diff --git a/flake.nix b/flake.nix
index c020740f6..77b8d1461 100644
--- a/flake.nix
+++ b/flake.nix
@@ -98,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 {