diff options
author | Janne Heß <janne@hess.ooo> | 2022-05-18 13:50:23 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-05-18 13:50:23 +0200 |
commit | c911240e9cc2a7c12c985bd32700b9657b5698a9 (patch) | |
tree | dbc3be92b092f469cb5c633f22e907adcc531492 /pkgs/os-specific/windows/mingw-w64/default.nix | |
parent | 7456be85db41b32e0f3e2e7bd4371d4d4bd15816 (diff) |
Revert "Add mingwW64-llvm cross-system."
Diffstat (limited to 'pkgs/os-specific/windows/mingw-w64/default.nix')
-rw-r--r-- | pkgs/os-specific/windows/mingw-w64/default.nix | 26 |
1 files changed, 3 insertions, 23 deletions
diff --git a/pkgs/os-specific/windows/mingw-w64/default.nix b/pkgs/os-specific/windows/mingw-w64/default.nix index 02cfd7b04a77a..38293e65f70f5 100644 --- a/pkgs/os-specific/windows/mingw-w64/default.nix +++ b/pkgs/os-specific/windows/mingw-w64/default.nix @@ -1,32 +1,14 @@ { lib, stdenv, windows, fetchurl }: let - version = "10.0.0"; - - knownArches = [ "32" "64" "arm32" "arm64" ]; - enabledArch = - if stdenv.targetPlatform.isAarch32 - then "arm32" - else if stdenv.targetPlatform.isAarch64 - then "arm64" - else if stdenv.targetPlatform.isx86_32 - then "32" - else if stdenv.targetPlatform.isx86_64 - then "64" - else null; - archFlags = - if enabledArch == null - then [] # maybe autoconf will save us - else map (arch: lib.enableFeature (arch == enabledArch) "lib${arch}") knownArches; - - crt = stdenv.hostPlatform.libc; + version = "9.0.0"; in stdenv.mkDerivation { pname = "mingw-w64"; inherit version; src = fetchurl { url = "mirror://sourceforge/mingw-w64/mingw-w64-v${version}.tar.bz2"; - sha256 = "sha256-umtDCu1yxjo3aFMfaj/8Kw/eLFejslFFDc9ImolPCJQ="; + sha256 = "10a15bi4lyfi0k0haj0klqambicwma6yi7vssgbz8prg815vja8r"; }; outputs = [ "out" "dev" ]; @@ -34,8 +16,7 @@ in stdenv.mkDerivation { configureFlags = [ "--enable-idl" "--enable-secure-api" - "--with-default-msvcrt=${crt}" - ] ++ archFlags; + ]; enableParallelBuilding = true; @@ -45,6 +26,5 @@ in stdenv.mkDerivation { meta = { platforms = lib.platforms.windows; - broken = !(lib.elem crt [ "msvcrt" "ucrt" ]); }; } |