From 978ea89fe07a77342d85dbe80464b0030651976e Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Tue, 16 Jun 2020 13:16:03 +0800 Subject: [PATCH] wfvm: install cmake in msys2 packages --- artiq-fast/wfvm/layers/make_msys_packages.sh | 2 +- artiq-fast/wfvm/layers/msys_packages.nix | 30 ++++++++++++++++++++ 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/artiq-fast/wfvm/layers/make_msys_packages.sh b/artiq-fast/wfvm/layers/make_msys_packages.sh index aec92d5..d75003e 100755 --- a/artiq-fast/wfvm/layers/make_msys_packages.sh +++ b/artiq-fast/wfvm/layers/make_msys_packages.sh @@ -17,7 +17,7 @@ in set TOOLPREF=mingw-w64-i686- set TRIPLE=x86_64-pc-mingw32 set PATH=%MSYS%\usr\bin;%MSYS%\mingw%ARCH%\bin;%PATH% - pacman -Sp %TOOLPREF%gcc %TOOLPREF%binutils make autoconf automake libtool texinfo > packages.txt + pacman -Sp %TOOLPREF%gcc %TOOLPREF%binutils make autoconf automake libtool texinfo cmake > packages.txt EOF \${wfvm.utils.win-put}/bin/win-put getmsyspackages.bat \${wfvm.utils.win-exec}/bin/win-exec getmsyspackages diff --git a/artiq-fast/wfvm/layers/msys_packages.nix b/artiq-fast/wfvm/layers/msys_packages.nix index e9f81f1..04b4e11 100644 --- a/artiq-fast/wfvm/layers/msys_packages.nix +++ b/artiq-fast/wfvm/layers/msys_packages.nix @@ -174,4 +174,34 @@ url = "http://repo.msys2.org/msys/x86_64/texinfo-6.7-1-x86_64.pkg.tar.xz"; sha256 = "0c50809yg9g95m8yib867q8m28sjabqppz2qbzh3gr83z55kknnw"; }) + +(pkgs.fetchurl { + url = "http://repo.msys2.org/msys/x86_64/jsoncpp-1.9.1-2-any.pkg.tar.xz"; + sha256 = "02gpvddk4d037kmn5hyz8lpwg80zp1g7wcsp53d8f60dz735z1i1"; +}) + +(pkgs.fetchurl { + url = "http://repo.msys2.org/msys/x86_64/libarchive-3.4.3-1-x86_64.pkg.tar.zst"; + sha256 = "15piplgk5rqqmbhk0pvfh3d6cs0nqk5sb43kmz24rjy5wkfvwpq1"; +}) + +(pkgs.fetchurl { + url = "http://repo.msys2.org/msys/x86_64/librhash-1.3.9-1-x86_64.pkg.tar.xz"; + sha256 = "0p782qw0991zgv2shc12np9jrdna688a5hlwyrrvrxh7clfmlgzr"; +}) + +(pkgs.fetchurl { + url = "http://repo.msys2.org/msys/x86_64/libuv-1.38.0-1-x86_64.pkg.tar.zst"; + sha256 = "1gb8rq4nf7wwa0jhjwakyip2f4v31sajyjj6fsxxnb5bwf37vznb"; +}) + +(pkgs.fetchurl { + url = "http://repo.msys2.org/msys/x86_64/pkg-config-0.29.2-1-x86_64.pkg.tar.xz"; + sha256 = "12f615hnzdxpv7q3apwbqkr8fqw4jpgkfzr23g9yhbrf84qd0gvb"; +}) + +(pkgs.fetchurl { + url = "http://repo.msys2.org/msys/x86_64/cmake-3.17.3-1-x86_64.pkg.tar.zst"; + sha256 = "0yrv5b2w509pmc2apwbfgnv607ysv6c9w01736ax21dyhr8wr8a2"; +}) ]