Skip to content

Commit dc79bff

Browse files
committed
[DDW-1213] Get rid of a few more binary blobs on Windows
1 parent 5239f9f commit dc79bff

File tree

2 files changed

+3
-10
lines changed

2 files changed

+3
-10
lines changed

installers/common/WindowsInstaller.hs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,13 +241,15 @@ writeInstallerNSIS outName (Version fullVersion') InstallerConfig{installDirecto
241241
file [] "cardano-launcher.exe"
242242
file [] "libffi-8.dll"
243243
file [] "libgmp-10.dll"
244+
file [] "libstdc++-6.dll"
245+
file [] "mcfgthread-12.dll"
246+
file [] "libgcc_s_seh-1.dll"
244247
--file [] "cardano-x509-certificates.exe"
245248
--file [] "log-config-prod.yaml"
246249
--file [] "wallet-topology.yaml"
247250
--file [] "configuration.yaml"
248251
--file [] "*genesis*.json"
249252
file [] "launcher-config.yaml"
250-
file [Recursive] "dlls\\"
251253
file [Recursive] "..\\release\\win32-x64\\$SpacedName-win32-x64\\"
252254

253255
mapM_ unsafeInject

nix/x86_64-windows.nix

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -435,11 +435,6 @@ in rec {
435435
# a cross-compiled fastlist for the ps-list package
436436
fastlist = pkgs.pkgsCross.mingwW64.callPackage ./fastlist.nix {};
437437

438-
dlls = pkgs.fetchurl {
439-
url = "https://s3.eu-central-1.amazonaws.com/daedalus-ci-binaries/DLLs.zip";
440-
sha256 = "0p6nrf8sg2wgcaf3b1qkbb98bz2dimb7lnshsa93xnmia9m2vsxa";
441-
};
442-
443438
preSigning = let
444439
installDir = oldCode.launcherConfigs.installerConfig.spacedName;
445440
in pkgs.runCommand "pre-signing" { buildInputs = [ pkgs.unzip ]; } ''
@@ -458,10 +453,6 @@ in rec {
458453
cp -v ${fastlist}/bin/fastlist.exe "../release/win32-x64/${installDir}-win32-x64/resources/app/dist/main/fastlist.exe"
459454
ln -s ${../installers/nsis_plugins} nsis_plugins
460455
461-
mkdir dlls
462-
pushd dlls
463-
unzip ${dlls}
464-
popd
465456
cp -vr ${oldCode.daedalus-bridge}/bin/* .
466457
cp -v ${nsisFiles}/{*.yaml,*.json,daedalus.nsi,*.key,*.cert} .
467458
cp ${unsignedUninstaller}/uninstall.exe .

0 commit comments

Comments
 (0)