From 8866f145dc0359d0914cc2a1ba22ed44dcbeb737 Mon Sep 17 00:00:00 2001 From: wlph17 Date: Wed, 28 Dec 2022 17:42:54 +0800 Subject: [PATCH] debug:issue#2007 --- flake.nix | 5 +++++ msys2/default.nix | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 4b86150..3fefedd 100644 --- a/flake.nix +++ b/flake.nix @@ -428,6 +428,11 @@ name = "artiq"; src = artiq; inherit (artiq.packages.x86_64-linux.artiq) version; + prepare = + '' + export VERSIONEER_OVERRIDE=${artiq.packages.x86_64-linux.artiq.version} + export VERSIONEER_REV=${artiq.sourceInfo.rev} + ''; depends = [ "mingw-w64-x86_64-python" "mingw-w64-x86_64-python-h5py" diff --git a/msys2/default.nix b/msys2/default.nix index 62d1851..e230405 100644 --- a/msys2/default.nix +++ b/msys2/default.nix @@ -25,7 +25,7 @@ let exec ${pkgs.wineWowPackages.stable}/bin/wine64 $@ ''; in { - makeMsys2Package = { name, version, src, depends }: pkgs.stdenvNoCC.mkDerivation { + makeMsys2Package = { name, version, src, prepare, depends }: pkgs.stdenvNoCC.mkDerivation { pname = "${name}-msys2-pkg"; inherit version; nativeBuildInputs = [ @@ -37,6 +37,7 @@ in { buildPhase = '' export DRV_VERSION=${version} + ${prepare} cat > PKGBUILD << HEREDOC pkgbase="mingw-w64-${name}" pkgname="mingw-w64-x86_64-${name}"