Unverified Commit 613a1daf authored by seth's avatar seth
Browse files

windows.*: format with nixfmt

parent b5bf8e3f

pkgs/os-specific/windows/cygwin-setup/default.nix

+37 −11
Original line number Diff line number Diff line 
{ lib, stdenv, fetchcvs, autoconf, automake, libtool, flex, bison, pkg-config

, zlib, bzip2, xz, libgcrypt

{

  lib,

  stdenv,

  fetchcvs,

  autoconf,

  automake,

  libtool,

  flex,

  bison,

  pkg-config,

  zlib,

  bzip2,

  xz,

  libgcrypt,

}:



stdenv.mkDerivation rec {
@@ -13,16 +25,30 @@ stdenv.mkDerivation rec { 
    sha256 = "024wxaaxkf7p1i78bh5xrsqmfz7ss2amigbfl2r5w9h87zqn9aq3";

  };



  nativeBuildInputs = [ autoconf automake libtool flex bison pkg-config ];

  nativeBuildInputs = [

    autoconf

    automake

    libtool

    flex

    bison

    pkg-config

  ];



  buildInputs = let

  buildInputs =

    let

      mkStatic = lib.flip lib.overrideDerivation (o: {

        dontDisableStatic = true;

        configureFlags = lib.toList (o.configureFlags or [ ]) ++ [ "--enable-static" ];

        buildInputs = map mkStatic (o.buildInputs or [ ]);

        propagatedBuildInputs = map mkStatic (o.propagatedBuildInputs or [ ]);

      });

  in map mkStatic [ zlib bzip2 xz libgcrypt ];

    in

    map mkStatic [

      zlib

      bzip2

      xz

      libgcrypt

    ];



  configureFlags = [ "--disable-shared" ];

pkgs/os-specific/windows/default.nix

+38 −32
Original line number Diff line number Diff line 
{ lib, stdenv, buildPackages

, newScope, overrideCC, stdenvNoLibc, libcCross

{

  lib,

  stdenv,

  buildPackages,

  newScope,

  overrideCC,

  stdenvNoLibc,

  libcCross,

}:



lib.makeScope newScope (self: with self; {

lib.makeScope newScope (

  self: with self; {



    cygwinSetup = callPackage ./cygwin-setup { };
@@ -18,29 +25,28 @@ lib.makeScope newScope (self: with self; { 
    };



    # FIXME untested with llvmPackages_16 was using llvmPackages_8

  crossThreadsStdenv = overrideCC stdenvNoLibc

    (if stdenv.hostPlatform.useLLVM or false

     then buildPackages.llvmPackages.clangNoLibcxx

     else buildPackages.gccWithoutTargetLibc.override (old: {

    crossThreadsStdenv = overrideCC stdenvNoLibc (

      if stdenv.hostPlatform.useLLVM or false then

        buildPackages.llvmPackages.clangNoLibcxx

      else

        buildPackages.gccWithoutTargetLibc.override (old: {

          bintools = old.bintools.override {

            libc = libcCross;

          };

          libc = libcCross;

     }));

        })

    );



    mingw_w64_headers = callPackage ./mingw-w64/headers.nix { };



  mingw_w64_pthreads = callPackage ./mingw-w64/pthreads.nix {

    stdenv = crossThreadsStdenv;

  };

    mingw_w64_pthreads = callPackage ./mingw-w64/pthreads.nix { stdenv = crossThreadsStdenv; };



  mcfgthreads = callPackage ./mcfgthreads {

    stdenv = crossThreadsStdenv;

  };

    mcfgthreads = callPackage ./mcfgthreads { stdenv = crossThreadsStdenv; };



    npiperelay = callPackage ./npiperelay { };



    pthreads = callPackage ./pthread-w32 { };



    libgnurx = callPackage ./libgnurx { };

})
 
  }

)

pkgs/os-specific/windows/dlfcn/default.nix

+6 −1
Original line number Diff line number Diff line 
{ stdenv, lib, fetchFromGitHub, cmake }:

{

  stdenv,

  lib,

  fetchFromGitHub,

  cmake,

}:



stdenv.mkDerivation rec {

  pname = "dlfcn";

pkgs/os-specific/windows/libgnurx/default.nix

+7 −2
Original line number Diff line number Diff line 
{ lib, stdenv, fetchurl }:

{

  lib,

  stdenv,

  fetchurl,

}:



let

  version = "2.5.1";

in stdenv.mkDerivation rec {

in

stdenv.mkDerivation rec {

  pname = "libgnurx";

  inherit version;

  src = fetchurl {

pkgs/os-specific/windows/mcfgthreads/default.nix

+10 −8
Original line number Diff line number Diff line 
{ lib

, stdenv

, fetchFromGitHub

, autoreconfHook

{

  lib,

  stdenv,

  fetchFromGitHub,

  autoreconfHook,

}:



stdenv.mkDerivation rec {
@@ -15,12 +16,13 @@ stdenv.mkDerivation rec { 
    hash = "sha256-FrmeaQhwLrNewS0HDlbWgCvVQ5U1l0jrw0YVuQdt9Ck=";

  };



  outputs = [ "out" "dev" ];



  nativeBuildInputs = [

    autoreconfHook

  outputs = [

    "out"

    "dev"

  ];



  nativeBuildInputs = [ autoreconfHook ];



  meta = {

    description = "Threading support library for Windows 7 and above";

    homepage = "https://github.com/lhmouse/mcfgthread/wiki";