From 895a683d399afca1b6e7ab8e02b9508dd81b281b Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 26 Feb 2014 06:19:05 +0100 Subject: [PATCH] vm/windows: Add setup.ini for 32bit architecture. Also update 64bit setup.ini and check whether we have a 64 bit stdenv in order to choose the proper Cygwin version. Otherwise we now have the setup.ini for 32bit available as well. Signed-off-by: aszlig --- pkgs/build-support/vm/windows/cygwin-iso/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/vm/windows/cygwin-iso/default.nix b/pkgs/build-support/vm/windows/cygwin-iso/default.nix index c7b1cc8bbcb..a806ea9571f 100644 --- a/pkgs/build-support/vm/windows/cygwin-iso/default.nix +++ b/pkgs/build-support/vm/windows/cygwin-iso/default.nix @@ -6,9 +6,12 @@ }: let - cygPkgList = fetchurl { + cygPkgList = if stdenv.is64bit then fetchurl { url = "${mirror}/x86_64/setup.ini"; - sha256 = "19vfm7zr8kcp1algmggk8vsilkccycx22mdf0ynfl6lcmp6dkfsz"; + sha256 = "142f8zyfwgi6s2djxv3z5wn0ysl94pxwa79z8rjfqz4kvnpgz120"; + } else fetchurl { + url = "${mirror}/x86/setup.ini"; + sha256 = "1v596lln2iip5h7wxjnig5rflzvqa21zzd2iyhx07zs28q5h76i9"; }; makeCygwinClosure = { packages, packageList }: let