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

Fix afws client certs #21

Merged
sb10q merged 2 commits from esavkin/artiq-extrapkg:fix-cacerts-and-package into master 2024-08-15 18:35:54 +08:00
Conversation 4 Commits 2 Files Changed 1 +10
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 88bcb7874a - Show all commits

3
flake.nix
View File

@ -521,6 +521,8 @@
buildInputs = [ pkgs.gnutar pkgs.zstd pkgs.pacman pkgs.fakeroot ]; buildInputs = [ pkgs.gnutar pkgs.zstd pkgs.pacman pkgs.fakeroot ];
phases = [ "installPhase" ]; phases = [ "installPhase" ];
cacerts = builtins.head (builtins.filter (entry: (builtins.match "^mingw-w64-clang-x86_64-ca-certificates$" entry.name) != null) artiq-deps-pkgs);
installPhase = '' installPhase = ''
mkdir $out mkdir $out
mkdir -p tmp/cache mkdir -p tmp/cache
@ -532,6 +534,7 @@
fakeroot pacman -U --asdeps --noconfirm --cachedir tmp/cache --config tmp/pacman.conf --root $out ${pkgs.lib.concatStringsSep " " (map (p: "${p}") artiq-deps-pkgs)} fakeroot pacman -U --asdeps --noconfirm --cachedir tmp/cache --config tmp/pacman.conf --root $out ${pkgs.lib.concatStringsSep " " (map (p: "${p}") artiq-deps-pkgs)}
fakeroot pacman -U --noconfirm --cachedir tmp/cache --config tmp/pacman.conf --root $out ${msys2-artiq}/*.pkg.tar.zst ${msys2-artiq-comtools}/*.pkg.tar.zst ${msys2-pythonparser}/*.pkg.tar.zst ${msys2-sipyco}/*.pkg.tar.zst fakeroot pacman -U --noconfirm --cachedir tmp/cache --config tmp/pacman.conf --root $out ${msys2-artiq}/*.pkg.tar.zst ${msys2-artiq-comtools}/*.pkg.tar.zst ${msys2-pythonparser}/*.pkg.tar.zst ${msys2-sipyco}/*.pkg.tar.zst
cp ${zadig-binary} $out/zadig.exe cp ${zadig-binary} $out/zadig.exe
cp ${cacerts} "$out/mingw-w64-clang-x86_64-ca-certificates.pkg.tar.zst"
rm -rf $out/mingw64* $out/clang32* $out/clangarm64* $out/mingw32* $out/ucrt64* \ rm -rf $out/mingw64* $out/clang32* $out/clangarm64* $out/mingw32* $out/ucrt64* \
$out/var/lib/pacman/sync/mingw64* $out/var/lib/pacman/sync/clang32* $out/var/lib/pacman/sync/clangarm64* \ $out/var/lib/pacman/sync/mingw64* $out/var/lib/pacman/sync/clang32* $out/var/lib/pacman/sync/clangarm64* \
$out/var/lib/pacman/sync/mingw32* $out/var/lib/pacman/sync/ucrt64* \ $out/var/lib/pacman/sync/mingw32* $out/var/lib/pacman/sync/ucrt64* \

7
installer/qt-ifw/packages/com.msys2.root/meta/installscript.js
View File

@ -41,6 +41,12 @@ function createShortcuts()
["@TargetDir@\\usr\\bin\\bash.exe", "--login", "-c", "exit"]); ["@TargetDir@\\usr\\bin\\bash.exe", "--login", "-c", "exit"]);
} }
function postInstall() {
component.addOperation( "Execute",
["@TargetDir@\\usr\\bin\\bash.exe", "--login", "-c", "pacman -Udd --noconfirm /mingw-w64-clang-x86_64-ca-certificates.pkg.tar.zst && rm /mingw-w64-clang-x86_64-ca-certificates.pkg.tar.zst"]);
}
function Component() { function Component() {
if (!isSupported()) { if (!isSupported()) {
@ -61,5 +67,6 @@ function Component() {
Component.prototype.createOperations = function() Component.prototype.createOperations = function()
{ {
component.createOperations(); component.createOperations();
postInstall();
createShortcuts(); createShortcuts();
} }