diff --git a/flake.nix b/flake.nix index 0bb41e1..ec00a82 100644 --- a/flake.nix +++ b/flake.nix @@ -562,7 +562,7 @@ sed -i "s|@DATE@|$(date +'%Y-%m-%d')|g" qt-ifw/config/config.xml qt-ifw/packages/com.msys2.root/meta/package.xml ; sed -i "s|@VERSION@|$(date +'%Y%m%d')|g" qt-ifw/config/config.xml qt-ifw/packages/com.msys2.root/meta/package.xml ; - 7z a -mx9 -md128m "qt-ifw/packages/com.msys2.root/data/msys64.7z" "msys2_artiq_image/"* + 7z a -mx9 -md128m "qt-ifw/packages/com.msys2.root/data/msys64.7z" "$msys2_artiq_image/"* ${pkgs.wineWowPackages.stable}/bin/wine64 $msys2_qt_ifw/mingw64/bin/binarycreator.exe \ -t "$msys2_qt_ifw/mingw64/bin/installerbase.exe" \ -p "qt-ifw/packages" \ diff --git a/msys2/artiq_dep_packages.nix b/msys2/artiq_dep_packages.nix index a5e6841..afe9ef7 100644 --- a/msys2/artiq_dep_packages.nix +++ b/msys2/artiq_dep_packages.nix @@ -486,6 +486,12 @@ sha256 = "1fc4pbzkm9wc2i874vfaxbin2p7bryx1yan1n0vvzddr747qxi21"; }) + (pkgs.fetchurl { + url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-llvm-18.1.4-1-any.pkg.tar.zst"; + name = "mingw-w64-x86_64-llvm"; + sha256 = "0446wv29vp1pld6drjaw1lr93lijcvn6l66jj4r5m1gyrf07jhlh"; + }) + (pkgs.fetchurl { url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-python-attrs-23.2.0-1-any.pkg.tar.zst"; name = "mingw-w64-x86_64-python-attrs"; diff --git a/msys2/artiq_deps.txt b/msys2/artiq_deps.txt index bf9d716..20161a0 100644 --- a/msys2/artiq_deps.txt +++ b/msys2/artiq_deps.txt @@ -14,3 +14,4 @@ mingw-w64-x86_64-python-llvmlite mingw-w64-x86_64-python-levenshtein mingw-w64-x86_64-python-lmdb mingw-w64-x86_64-lld +mingw-w64-x86_64-llvm