Unverified Commit b4b350d8 authored by John Ericson's avatar John Ericson Committed by GitHub
Browse files

windows.pthreads: Remove win32-pthreads, exclusively use mingwW64 pthreads (#430165)

parents 14f612c4 bb7c7900

pkgs/by-name/ro/rocksdb/package.nix

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: { 
  buildInputs =

    lib.optional enableJemalloc jemalloc

    ++ lib.optional enableLiburing liburing

    ++ lib.optional stdenv.hostPlatform.isMinGW windows.mingw_w64_pthreads;

    ++ lib.optional stdenv.hostPlatform.isMinGW windows.pthreads;



  outputs = [

    "out"

pkgs/by-name/s7/s7/package.nix

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: { 
      libmpc

    ]

    ++ lib.optional withNrepl notcurses

    ++ lib.optional stdenv.hostPlatform.isMinGW windows.mingw_w64_pthreads;

    ++ lib.optional stdenv.hostPlatform.isMinGW windows.pthreads;



  # The following scripts are modified from [Guix's](https://packages.guix.gnu.org/packages/s7/).

pkgs/by-name/sr/srt/package.nix

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec { 
    openssl

  ]

  ++ lib.optionals stdenv.hostPlatform.isMinGW [

    windows.mingw_w64_pthreads

    windows.pthreads

  ];



  patches = lib.optionals stdenv.hostPlatform.isMinGW [

pkgs/development/interpreters/python/cpython/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -248,7 +248,7 @@ let 
    ]

    ++ optionals stdenv.hostPlatform.isMinGW [

      windows.dlfcn

      windows.mingw_w64_pthreads

      windows.pthreads

    ]

    ++ optionals tzdataSupport [

      tzdata

pkgs/development/libraries/flint/3.nix

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec { 
    ntl

  ]

  ++ lib.optionals stdenv.hostPlatform.isMinGW [

    windows.mingw_w64_pthreads

    windows.pthreads

  ];



  # We're not using autoreconfHook because flint's bootstrap