M-Labs
/
artiq-extrapkg
2
0
Fork 4
Code Issues 2 Pull Requests 1 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 f61fb65c84
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
flake.nix
View File

@ -518,7 +518,7 @@
}; };
src = ./.; src = ./.;
buildInputs = [ pkgs.gnutar pkgs.zstd pkgs.pacman pkgs.fakeroot ]; buildInputs = [ pkgs.gnutar pkgs.zstd pkgs.pacman pkgs.fakeroot pkgs.p11-kit pkgs.cacert pkgs.openssl ];
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); cacerts = builtins.head (builtins.filter (entry: (builtins.match "^mingw-w64-clang-x86_64-ca-certificates$" entry.name) != null) artiq-deps-pkgs);
@ -534,7 +534,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 --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" 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* \ 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* \
@ -552,7 +555,7 @@
sed -i "s|@DATE@|$(date +'%Y-%m-%d')|g" qt-ifw/config/config.xml qt-ifw/packages/com.msys2.root/meta/package.xml ; sed -i "s|@DATE@|$(date +'%Y-%m-%d')|g" qt-ifw/config/config.xml qt-ifw/packages/com.msys2.root/meta/package.xml ;
sed -i "s|@VERSION@|${artiqpkgs.packages.x86_64-linux.artiq.version}|g" qt-ifw/config/config.xml qt-ifw/packages/com.msys2.root/meta/package.xml ; sed -i "s|@VERSION@|${artiqpkgs.packages.x86_64-linux.artiq.version}|g" qt-ifw/config/config.xml qt-ifw/packages/com.msys2.root/meta/package.xml ;
7z a -mx9 -md128m "qt-ifw/packages/com.msys2.root/data/msys64.7z" "$msys2_artiq_root/"* 7z a -mx3 -md16m "qt-ifw/packages/com.msys2.root/data/msys64.7z" "$msys2_artiq_root/"*
${pkgs.wineWowPackages.stable}/bin/wine64 $msys2_qt_ifw/clang64/bin/binarycreator.exe \ ${pkgs.wineWowPackages.stable}/bin/wine64 $msys2_qt_ifw/clang64/bin/binarycreator.exe \
-t "$msys2_qt_ifw/clang64/bin/installerbase.exe" \ -t "$msys2_qt_ifw/clang64/bin/installerbase.exe" \
-p "qt-ifw/packages" \ -p "qt-ifw/packages" \

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