Merge pull request #2218 from alerque/flake-sync

Sync flake with nixpkg
sile-typesetter · Feb 6, 2025 · aab22e7 · aab22e7
2 parents 901d6bd + 648a4bf
commit aab22e7
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 16 deletions.
diff --git a/build-aux/pkg.nix b/build-aux/pkg.nix
@@ -57,6 +57,7 @@ stdenv.mkDerivation (finalAttrs: {
     autoreconfHook
     gitMinimal
     pkg-config
+    fontconfig # fc-match
     jq
     cargo
     rustc
@@ -78,19 +79,18 @@ stdenv.mkDerivation (finalAttrs: {
     sed -i -e 's/tarball-version/flake-version/' configure.ac
   '';
 
-  buildInputs =
-    [
-      finalAttrs.finalPackage.passthru.luaEnv
-      cargo-edit
-      harfbuzz
-      icu
-      fontconfig
-      libiconv
-      libxslt
-      stylua
-      taplo
-      typos
-    ];
+  buildInputs = [
+    finalAttrs.finalPackage.passthru.luaEnv
+    cargo-edit
+    harfbuzz
+    icu
+    fontconfig
+    libiconv
+    libxslt
+    stylua
+    taplo
+    typos
+  ];
 
   configureFlags =
     [
@@ -123,6 +123,9 @@ stdenv.mkDerivation (finalAttrs: {
     ];
   };
 
+  strictDeps = true;
+  env.LUA = "${finalAttrs.finalPackage.passthru.luaEnv}/bin/lua";
+
   enableParallelBuilding = true;
 
   # See commentary in bootstrap.sh; we're getting AMINCCLUDE stuff inlined

diff --git a/flake.lock b/flake.lock