From 196f0b163a3ca89aab4838d8096359a42df6c421 Mon Sep 17 00:00:00 2001 From: Egor Savkin Date: Tue, 7 May 2024 12:04:20 +0800 Subject: [PATCH] Add artiq version to the installer Signed-off-by: Egor Savkin --- flake.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/flake.nix b/flake.nix index 21fc952..d952a6d 100644 --- a/flake.nix +++ b/flake.nix @@ -515,7 +515,7 @@ msys2-offline-installer = pkgs.stdenv.mkDerivation { name = "msys2-offline-installer"; - buildInputs = with pkgs; [ p7zip wine64 ]; + buildInputs = with pkgs; [ p7zip ]; src = ./.; msys2_qt_ifw = pkgs.stdenvNoCC.mkDerivation rec { name = "msys2_qt_ifw"; @@ -564,7 +564,7 @@ # needed for sed and 7z chmod -R 700 qt-ifw 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 ; + sed -i "s|@VERSION@|${artiqpkgs.packages.x86_64-linux.artiq.version}|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_root/"* ${pkgs.wineWowPackages.stable}/bin/wine64 $msys2_qt_ifw/mingw64/bin/binarycreator.exe \