esavkin
/
artiq-extrapkg
forked from M-Labs/artiq-extrapkg
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: esavkin:f61fb65c84538e2873a3658ddd7d89cfdcc9364c
Branches Tags
esavkin:master
esavkin:func-args
esavkin:fix-cacerts-and-package
esavkin:fix-msys2-package
esavkin:update-llvm15
esavkin:release-8
esavkin:2428-zadig
esavkin:2316-move-to-clang
esavkin:14-msys2-artiq
esavkin:2289-offline-installer
esavkin:2316-add-llvm
esavkin:python-lmdb
esavkin:release-7
M-Labs:master
M-Labs:release-8
M-Labs:release-7
...
compare: esavkin:a73be047fe33689808748bf379f04698c6be68eb
Branches Tags
esavkin:func-args
esavkin:fix-cacerts-and-package
esavkin:fix-msys2-package
esavkin:update-llvm15
esavkin:release-8
esavkin:2428-zadig
esavkin:2316-move-to-clang
esavkin:14-msys2-artiq
esavkin:2289-offline-installer
esavkin:2316-add-llvm
esavkin:python-lmdb
esavkin:release-7
esavkin:master
M-Labs:master
M-Labs:release-8
M-Labs:release-7

1 Commits
f61fb65c84 ... a73be047fe

Author SHA1 Message Date
Egor Savkin a73be047fe Fix certs issue 
Signed-off-by: Egor Savkin <es@m-labs.hk>
 2024-08-13 16:48:23 +08:00
2 changed files with 10 additions and 0 deletions
Show Stats Expand all files Collapse all files

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();
} }