M-Labs
/
artiq-extrapkg
2
0
Fork 4
Code Issues 2 Pull Requests 1 Projects Releases Wiki Activity

debug:issue#2007 #7

Merged
sb10q merged 1 commits from wlph17/artiq-extrapkg:bug_fix_#2007 into master 2022-12-28 17:55:35 +08:00
Conversation 1 Commits 1 Files Changed 2 +7 -1
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 8866f145dc - Show all commits

5
flake.nix
View File

@ -428,6 +428,11 @@
name = "artiq"; name = "artiq";
src = artiq; src = artiq;
inherit (artiq.packages.x86_64-linux.artiq) version; 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 = [ depends = [
"mingw-w64-x86_64-python" "mingw-w64-x86_64-python"
"mingw-w64-x86_64-python-h5py" "mingw-w64-x86_64-python-h5py"

3
msys2/default.nix
View File

@ -25,7 +25,7 @@ let
exec ${pkgs.wineWowPackages.stable}/bin/wine64 $@ exec ${pkgs.wineWowPackages.stable}/bin/wine64 $@
''; '';
in { in {
makeMsys2Package = { name, version, src, depends }: pkgs.stdenvNoCC.mkDerivation { makeMsys2Package = { name, version, src, prepare, depends }: pkgs.stdenvNoCC.mkDerivation {
pname = "${name}-msys2-pkg"; pname = "${name}-msys2-pkg";
inherit version; inherit version;
nativeBuildInputs = [ nativeBuildInputs = [
@ -37,6 +37,7 @@ in {
buildPhase = buildPhase =
'' ''
export DRV_VERSION=${version} export DRV_VERSION=${version}
${prepare}
cat > PKGBUILD << HEREDOC cat > PKGBUILD << HEREDOC
pkgbase="mingw-w64-${name}" pkgbase="mingw-w64-${name}"
pkgname="mingw-w64-x86_64-${name}" pkgname="mingw-w64-x86_64-${name}"