pyrox.dev / nixpkgs
lol
fork atom

Merge #2823: better cygwin support, also add x86_64

Conflicts (easy):
pkgs/development/interpreters/perl/5.16/default.nix

Vladimír Čunát d1ed0f44 59291fdb

+16 -3
unified split
+1 -1
lib/platforms.nix
··· 7 freebsd = ["i686-freebsd" "x86_64-freebsd"]; 8 openbsd = ["i686-openbsd" "x86_64-openbsd"]; 9 netbsd = ["i686-netbsd" "x86_64-netbsd"]; 10 - cygwin = ["i686-cygwin"]; 11 unix = linux ++ darwin ++ freebsd ++ openbsd; 12 all = linux ++ darwin ++ cygwin ++ freebsd ++ openbsd; 13 none = [];
··· 7 freebsd = ["i686-freebsd" "x86_64-freebsd"]; 8 openbsd = ["i686-openbsd" "x86_64-openbsd"]; 9 netbsd = ["i686-netbsd" "x86_64-netbsd"]; 10 + cygwin = ["i686-cygwin" "x86_64-cygwin"]; 11 unix = linux ++ darwin ++ freebsd ++ openbsd; 12 all = linux ++ darwin ++ cygwin ++ freebsd ++ openbsd; 13 none = [];
+7
pkgs/development/interpreters/perl/5.16/default.nix
··· 54 ${optionalString stdenv.isArm '' 55 configureFlagsArray=(-Dldflags="-lm -lrt") 56 ''} 57 ''; 58 59 preBuild = optionalString (!(stdenv ? gcc && stdenv.gcc.nativeTools)) ··· 64 65 setupHook = ./setup-hook.sh; 66 67 passthru.libPrefix = "lib/perl5/site_perl"; 68 }
··· 54 ${optionalString stdenv.isArm '' 55 configureFlagsArray=(-Dldflags="-lm -lrt") 56 ''} 57 + 58 + ${optionalString stdenv.isCygwin '' 59 + cp cygwin/cygwin.c{,.bak} 60 + echo "#define PERLIO_NOT_STDIO 0" > tmp 61 + cat tmp cygwin/cygwin.c.bak > cygwin/cygwin.c 62 + ''} 63 ''; 64 65 preBuild = optionalString (!(stdenv ? gcc && stdenv.gcc.nativeTools)) ··· 70 71 setupHook = ./setup-hook.sh; 72 73 + doCheck = stdenv.isLinux; 74 passthru.libPrefix = "lib/perl5/site_perl"; 75 }
+6 -1
pkgs/development/libraries/openssl/default.nix
··· 60 else "./config"; 61 62 configureFlags = "shared --libdir=lib --openssldir=etc/ssl" + 63 - stdenv.lib.optionalString withCryptodev " -DHAVE_CRYPTODEV -DUSE_CRYPTODEV_DIGESTS"; 64 65 makeFlags = "MANDIR=$(out)/share/man"; 66
··· 60 else "./config"; 61 62 configureFlags = "shared --libdir=lib --openssldir=etc/ssl" + 63 + stdenv.lib.optionalString withCryptodev " -DHAVE_CRYPTODEV -DUSE_CRYPTODEV_DIGESTS" + 64 + stdenv.lib.optionalString (stdenv.system == "x86_64-cygwin") " no-asm"; 65 + 66 + preBuild = stdenv.lib.optionalString (stdenv.system == "x86_64-cygwin") '' 67 + sed -i -e "s|-march=i486|-march=x86-64|g" Makefile 68 + ''; 69 70 makeFlags = "MANDIR=$(out)/share/man"; 71
+2 -1
pkgs/stdenv/generic/default.nix
··· 143 || system == "x86_64-kfreebsd-gnu"; 144 isSunOS = system == "i686-solaris" 145 || system == "x86_64-solaris"; 146 - isCygwin = system == "i686-cygwin"; 147 isFreeBSD = system == "i686-freebsd" 148 || system == "x86_64-freebsd"; 149 isOpenBSD = system == "i686-openbsd"
··· 143 || system == "x86_64-kfreebsd-gnu"; 144 isSunOS = system == "i686-solaris" 145 || system == "x86_64-solaris"; 146 + isCygwin = system == "i686-cygwin" 147 + || system == "x86_64-cygwin"; 148 isFreeBSD = system == "i686-freebsd" 149 || system == "x86_64-freebsd"; 150 isOpenBSD = system == "i686-openbsd"