Unverified Commit 3d51188a authored by seth's avatar seth
Browse files

windows.mingw_w64*: use lib for autoconf flags

parent 14e44039

pkgs/os-specific/windows/mingw-w64/default.nix

+3 −3
Original line number Diff line number Diff line
@@ -22,9 +22,9 @@ stdenv.mkDerivation { 
  ];



  configureFlags = [

    "--enable-idl"

    "--enable-secure-api"

    "--with-default-msvcrt=${crt}"

    (lib.enableFeature true "idl")

    (lib.enableFeature true "secure-api")

    (lib.withFeatureAs true "default-msvcrt" crt)

  ];



  enableParallelBuilding = true;

pkgs/os-specific/windows/mingw-w64/pthreads.nix

+9 −6
Original line number Diff line number Diff line 
{ stdenv, mingw_w64_headers }:

{

  lib,

  stdenv,

  mingw_w64_headers,

  # Rustc require 'libpthread.a' when targeting 'x86_64-pc-windows-gnu'.

  # Enabling this makes it work out of the box instead of failing.

  withStatic ? true,

}:



stdenv.mkDerivation {

  pname = "mingw_w64-pthreads";

  inherit (mingw_w64_headers) version src meta;



  configureFlags = [

    # Rustc require 'libpthread.a' when targeting 'x86_64-pc-windows-gnu'.

    # Enabling this makes it work out of the box instead of failing.

    "--enable-static"

  ];

  configureFlags = [ (lib.enableFeature withStatic "static") ];



  preConfigure = ''

    cd mingw-w64-libraries/winpthreads