colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cygwin-iso: fix the most obvious parts of bit rot

Browse Source 
Still doesn't build though. Is anyone still using it?
This commit is contained in:
Michael Raskin 2017-02-09 15:06:49 +01:00
parent 60cae1c173
commit 5f3fa24a20
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/build-support/vm/windows/cygwin-iso/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, runCommand, python, perl, cdrkit, pathsFromGraph { stdenv, fetchurl, runCommand, python, perl, xorriso, pathsFromGraph
, arch ? "x86_64" , arch ? "x86_64"
}: }:
@ -10,10 +10,10 @@
let let
cygPkgList = if arch == "x86_64" then fetchurl { cygPkgList = if arch == "x86_64" then fetchurl {
url = "${mirror}/x86_64/setup.ini"; url = "${mirror}/x86_64/setup.ini";
sha256 = "0ljsxdkx9s916wp28kcvql3bjx80zzzidan6jicby7i9s3sm96n9"; sha256 = "0arrxvxbl85l82iy648snx5cl952w791p45p0dfg1xpiaf96cbkj";
} else fetchurl { } else fetchurl {
url = "${mirror}/x86/setup.ini"; url = "${mirror}/x86/setup.ini";
sha256 = "1slyj4qha7x649ggwdski9spmyrbs04z2d46vgk8krllg0kppnjv"; sha256 = "1fayx34868vd5h2nah7chiw65sl3i9qzrwvs7lrlv2h8k412vb69";
}; };
cygwinCross = (import ../../../../.. { cygwinCross = (import ../../../../.. {
@ -25,23 +25,24 @@ let
inherit arch; inherit arch;
config = "${arch}-w64-mingw32"; config = "${arch}-w64-mingw32";
}; };
}).windows.cygwinSetup.crossDrv; }).windows.cygwinSetup;
makeCygwinClosure = { packages, packageList }: let makeCygwinClosure = { packages, packageList }: let
expr = import (runCommand "cygwin.nix" { buildInputs = [ python ]; } '' expr = import (runCommand "cygwin.nix" { buildInputs = [ python ]; } ''
python ${./mkclosure.py} "${packages}" ${toString packageList} > "$out" python ${./mkclosure.py} "${packages}" ${toString packageList} > "$out"
''); '');
gen = { url, md5 }: { gen = { url, hash }: {
source = fetchurl { source = fetchurl {
url = "${mirror}/${url}"; url = "${mirror}/${url}";
inherit md5; sha512 = hash;
}; };
target = url; target = url;
}; };
in map gen expr; in map gen expr;
in import ../../../../../nixos/lib/make-iso9660-image.nix { in import ../../../../../nixos/lib/make-iso9660-image.nix {
inherit stdenv perl cdrkit pathsFromGraph; inherit stdenv perl xorriso pathsFromGraph;
syslinux = null;
contents = [ contents = [
{ source = "${cygwinCross}/bin/setup.exe"; { source = "${cygwinCross}/bin/setup.exe";
target = "setup.exe"; target = "setup.exe";

4
pkgs/build-support/vm/windows/cygwin-iso/mkclosure.py
View File

@ -63,12 +63,12 @@ def main():
if install_line is None: if install_line is None:
continue continue
url, size, md5 = install_line.split(' ', 2) url, size, hash = install_line.split(' ', 2)
pack = [ pack = [
' {', ' {',
' url = "{0}";'.format(url), ' url = "{0}";'.format(url),
' md5 = "{0}";'.format(md5), ' hash = "{0}";'.format(hash),
' }', ' }',
]; ];
sys.stdout.write('\n'.join(pack) + '\n') sys.stdout.write('\n'.join(pack) + '\n')