diff options
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/os-specific/windows/mingw-w64/default.nix | 16 | ||||
-rw-r--r-- | pkgs/os-specific/windows/mingw-w64/headers.nix | 18 | ||||
-rw-r--r-- | pkgs/os-specific/windows/mingw-w64/pthreads.nix | 6 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
4 files changed, 20 insertions, 22 deletions
diff --git a/pkgs/os-specific/windows/mingw-w64/default.nix b/pkgs/os-specific/windows/mingw-w64/default.nix index 706186c8e2f15..ba2b243a9408a 100644 --- a/pkgs/os-specific/windows/mingw-w64/default.nix +++ b/pkgs/os-specific/windows/mingw-w64/default.nix @@ -3,18 +3,12 @@ , windows , fetchurl , autoreconfHook +, mingw_w64_headers }: -let - version = "11.0.1"; -in stdenv.mkDerivation { +stdenv.mkDerivation { pname = "mingw-w64"; - inherit version; - - src = fetchurl { - url = "mirror://sourceforge/mingw-w64/mingw-w64-v${version}.tar.bz2"; - hash = "sha256-P2a84Gnui+10OaGhPafLkaXmfqYXDyExesf1eUYl7hA="; - }; + inherit (mingw_w64_headers) version src meta; outputs = [ "out" "dev" ]; @@ -30,8 +24,4 @@ in stdenv.mkDerivation { nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ windows.mingw_w64_headers ]; hardeningDisable = [ "stackprotector" "fortify" ]; - - meta = { - platforms = lib.platforms.windows; - }; } diff --git a/pkgs/os-specific/windows/mingw-w64/headers.nix b/pkgs/os-specific/windows/mingw-w64/headers.nix index 1fd27a8c4573f..d5edaeaa2bd1e 100644 --- a/pkgs/os-specific/windows/mingw-w64/headers.nix +++ b/pkgs/os-specific/windows/mingw-w64/headers.nix @@ -1,11 +1,19 @@ -{ stdenvNoCC, mingw_w64 }: +{ lib, stdenvNoCC, fetchurl }: -stdenvNoCC.mkDerivation { - name = "${mingw_w64.name}-headers"; - inherit (mingw_w64) src meta; +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "mingw_w64-headers"; + version = "11.0.1"; + + src = fetchurl { + url = "mirror://sourceforge/mingw-w64/mingw-w64-v${finalAttrs.version}.tar.bz2"; + hash = "sha256-P2a84Gnui+10OaGhPafLkaXmfqYXDyExesf1eUYl7hA="; + }; preConfigure = '' cd mingw-w64-headers ''; -} + meta = { + platforms = lib.platforms.windows; + }; +}) diff --git a/pkgs/os-specific/windows/mingw-w64/pthreads.nix b/pkgs/os-specific/windows/mingw-w64/pthreads.nix index 3b143efed1d70..3c5fab4fa708f 100644 --- a/pkgs/os-specific/windows/mingw-w64/pthreads.nix +++ b/pkgs/os-specific/windows/mingw-w64/pthreads.nix @@ -1,8 +1,8 @@ -{ stdenv, mingw_w64 }: +{ stdenv, mingw_w64_headers }: stdenv.mkDerivation { - name = "${mingw_w64.name}-pthreads"; - inherit (mingw_w64) src meta; + pname = "mingw_w64-pthreads"; + inherit (mingw_w64_headers) version src meta; configureFlags = [ # Rustc require 'libpthread.a' when targeting 'x86_64-pc-windows-gnu'. diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c08e8f4c48020..0e3e7f2e055cc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15457,7 +15457,7 @@ with pkgs; dontStrip = true; })); - gccCrossLibcStdenv = overrideCC stdenv buildPackages.gccWithoutTargetLibc; + gccCrossLibcStdenv = overrideCC stdenvNoCC buildPackages.gccWithoutTargetLibc; crossLibcStdenv = if stdenv.hostPlatform.useLLVM or false || stdenv.hostPlatform.isDarwin |