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

Copy certs from base into clang64 

Signed-off-by: Egor Savkin <es@m-labs.hk>
This commit is contained in:
Egor Savkin 2024-08-15 17:05:52 +08:00
parent 88bcb7874a
commit d244efc689
2 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
flake.nix
View File

@ -521,8 +521,6 @@
buildInputs = [ pkgs.gnutar pkgs.zstd pkgs.pacman pkgs.fakeroot ];
phases = [ "installPhase" ];
cacerts = builtins.head (builtins.filter (entry: (builtins.match "^mingw-w64-clang-x86_64-ca-certificates$" entry.name) != null) artiq-deps-pkgs);
installPhase = ''
mkdir $out
mkdir -p tmp/cache
@ -534,7 +532,10 @@
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
cp ${zadig-binary} $out/zadig.exe
cp ${cacerts} "$out/mingw-w64-clang-x86_64-ca-certificates.pkg.tar.zst"
mkdir -p $out/clang64/etc/ssl/certs
cp -f $out/usr/ssl/certs/ca-bundle.crt $out/clang64/etc/ssl/certs/ca-bundle.crt
cp -f $out/usr/ssl/cert.pem $out/clang64/etc/ssl/cert.pem
cp -f $out/usr/ssl/certs/ca-bundle.trust.crt $out/clang64/etc/ssl/certs/ca-bundle.trust.crt
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/mingw32* $out/var/lib/pacman/sync/ucrt64* \

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

@ -41,12 +41,6 @@ function createShortcuts()
["@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() {
if (!isSupported()) {
@ -67,6 +61,5 @@ function Component() {
Component.prototype.createOperations = function()
{
component.createOperations();
postInstall();
createShortcuts();
}