diff --git a/pkgs/os-specific/windows/cygwin-setup/default.nix b/pkgs/os-specific/windows/cygwin-setup/default.nix index a88d802c5cf7..9cc920829ecd 100644 --- a/pkgs/os-specific/windows/cygwin-setup/default.nix +++ b/pkgs/os-specific/windows/cygwin-setup/default.nix @@ -1,5 +1,17 @@ -{ 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 - 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 ]; + 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 + ]; configureFlags = [ "--disable-shared" ]; diff --git a/pkgs/os-specific/windows/default.nix b/pkgs/os-specific/windows/default.nix index 7b9bbcc52f79..59806318a23e 100644 --- a/pkgs/os-specific/windows/default.nix +++ b/pkgs/os-specific/windows/default.nix @@ -1,46 +1,52 @@ -{ 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 { }; + cygwinSetup = callPackage ./cygwin-setup { }; - dlfcn = callPackage ./dlfcn { }; + dlfcn = callPackage ./dlfcn { }; - w32api = callPackage ./w32api { }; + w32api = callPackage ./w32api { }; - mingwrt = callPackage ./mingwrt { }; - mingw_runtime = mingwrt; + mingwrt = callPackage ./mingwrt { }; + mingw_runtime = mingwrt; - mingw_w64 = callPackage ./mingw-w64 { - stdenv = stdenvNoLibc; - }; + mingw_w64 = callPackage ./mingw-w64 { + stdenv = stdenvNoLibc; + }; - # 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: { - bintools = old.bintools.override { - libc = libcCross; - }; - libc = libcCross; - })); + # 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: { + bintools = old.bintools.override { + libc = libcCross; + }; + libc = libcCross; + }) + ); - mingw_w64_headers = callPackage ./mingw-w64/headers.nix { }; + 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 { }; + npiperelay = callPackage ./npiperelay { }; - pthreads = callPackage ./pthread-w32 { }; + pthreads = callPackage ./pthread-w32 { }; - libgnurx = callPackage ./libgnurx { }; -}) + libgnurx = callPackage ./libgnurx { }; + } +) diff --git a/pkgs/os-specific/windows/dlfcn/default.nix b/pkgs/os-specific/windows/dlfcn/default.nix index d1fba98e840a..1f4ea20d550d 100644 --- a/pkgs/os-specific/windows/dlfcn/default.nix +++ b/pkgs/os-specific/windows/dlfcn/default.nix @@ -1,4 +1,9 @@ -{ stdenv, lib, fetchFromGitHub, cmake }: +{ + stdenv, + lib, + fetchFromGitHub, + cmake, +}: stdenv.mkDerivation rec { pname = "dlfcn"; diff --git a/pkgs/os-specific/windows/libgnurx/default.nix b/pkgs/os-specific/windows/libgnurx/default.nix index e760bddabfbf..f3bc160e0cff 100644 --- a/pkgs/os-specific/windows/libgnurx/default.nix +++ b/pkgs/os-specific/windows/libgnurx/default.nix @@ -1,8 +1,13 @@ -{ 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 { diff --git a/pkgs/os-specific/windows/mcfgthreads/default.nix b/pkgs/os-specific/windows/mcfgthreads/default.nix index 9eabaf21e44f..2d5771068dc9 100644 --- a/pkgs/os-specific/windows/mcfgthreads/default.nix +++ b/pkgs/os-specific/windows/mcfgthreads/default.nix @@ -1,7 +1,8 @@ -{ 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"; diff --git a/pkgs/os-specific/windows/mingw-w64/default.nix b/pkgs/os-specific/windows/mingw-w64/default.nix index 36cdaf84aab6..ed09a560d42b 100644 --- a/pkgs/os-specific/windows/mingw-w64/default.nix +++ b/pkgs/os-specific/windows/mingw-w64/default.nix @@ -1,26 +1,31 @@ -{ lib -, stdenv -, windows -, autoreconfHook -, mingw_w64_headers +{ + lib, + stdenv, + windows, + autoreconfHook, + mingw_w64_headers, }: stdenv.mkDerivation { pname = "mingw-w64"; inherit (mingw_w64_headers) version src meta; - outputs = [ "out" "dev" ]; + outputs = [ + "out" + "dev" + ]; configureFlags = [ "--enable-idl" "--enable-secure-api" - ] ++ lib.optionals (stdenv.targetPlatform.libc == "ucrt") [ - "--with-default-msvcrt=ucrt" - ]; + ] ++ lib.optionals (stdenv.targetPlatform.libc == "ucrt") [ "--with-default-msvcrt=ucrt" ]; enableParallelBuilding = true; nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ windows.mingw_w64_headers ]; - hardeningDisable = [ "stackprotector" "fortify" ]; + hardeningDisable = [ + "stackprotector" + "fortify" + ]; } diff --git a/pkgs/os-specific/windows/mingw-w64/headers.nix b/pkgs/os-specific/windows/mingw-w64/headers.nix index d5edaeaa2bd1..aec85256545e 100644 --- a/pkgs/os-specific/windows/mingw-w64/headers.nix +++ b/pkgs/os-specific/windows/mingw-w64/headers.nix @@ -1,4 +1,8 @@ -{ lib, stdenvNoCC, fetchurl }: +{ + lib, + stdenvNoCC, + fetchurl, +}: stdenvNoCC.mkDerivation (finalAttrs: { pname = "mingw_w64-headers"; diff --git a/pkgs/os-specific/windows/mingwrt/default.nix b/pkgs/os-specific/windows/mingwrt/default.nix index 5bf6951cd434..7a116bcfeb80 100644 --- a/pkgs/os-specific/windows/mingwrt/default.nix +++ b/pkgs/os-specific/windows/mingwrt/default.nix @@ -1,4 +1,8 @@ -{ stdenv, lib, fetchurl }: +{ + stdenv, + lib, + fetchurl, +}: stdenv.mkDerivation rec { pname = "mingwrt"; @@ -14,5 +18,8 @@ stdenv.mkDerivation rec { }; dontStrip = true; - hardeningDisable = [ "stackprotector" "fortify" ]; + hardeningDisable = [ + "stackprotector" + "fortify" + ]; } diff --git a/pkgs/os-specific/windows/npiperelay/default.nix b/pkgs/os-specific/windows/npiperelay/default.nix index d2347edcbaff..a0c22a8552c5 100644 --- a/pkgs/os-specific/windows/npiperelay/default.nix +++ b/pkgs/os-specific/windows/npiperelay/default.nix @@ -1,4 +1,8 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ + lib, + buildGoModule, + fetchFromGitHub, +}: buildGoModule rec { pname = "npiperelay"; diff --git a/pkgs/os-specific/windows/pthread-w32/default.nix b/pkgs/os-specific/windows/pthread-w32/default.nix index b17d839554f5..0db99bf4c97d 100644 --- a/pkgs/os-specific/windows/pthread-w32/default.nix +++ b/pkgs/os-specific/windows/pthread-w32/default.nix @@ -1,4 +1,8 @@ -{ lib, stdenv, fetchzip }: +{ + lib, + stdenv, + fetchzip, +}: stdenv.mkDerivation { pname = "pthreads-w32"; @@ -9,7 +13,10 @@ stdenv.mkDerivation { sha256 = "1s8iny7g06z289ahdj0kzaxj0cd3wvjbd8j3bh9xlg7g444lhy9w"; }; - makeFlags = [ "CROSS=${stdenv.cc.targetPrefix}" "GC-static" ]; + makeFlags = [ + "CROSS=${stdenv.cc.targetPrefix}" + "GC-static" + ]; installPhase = '' runHook preInstall diff --git a/pkgs/os-specific/windows/w32api/default.nix b/pkgs/os-specific/windows/w32api/default.nix index 99faeeb7a8bf..e36833852566 100644 --- a/pkgs/os-specific/windows/w32api/default.nix +++ b/pkgs/os-specific/windows/w32api/default.nix @@ -1,4 +1,8 @@ -{ stdenv, fetchurl, lib }: +{ + stdenv, + fetchurl, + lib, +}: stdenv.mkDerivation rec { pname = "w32api";