windows.*: format with nixfmt

This commit is contained in:
seth 2024-08-16 04:35:01 -04:00
parent b5bf8e3fc7
commit 613a1dafd5
No known key found for this signature in database
GPG Key ID: D31BD0D494BBEE86
11 changed files with 146 additions and 71 deletions

View File

@ -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 { stdenv.mkDerivation rec {
@ -13,16 +25,30 @@ stdenv.mkDerivation rec {
sha256 = "024wxaaxkf7p1i78bh5xrsqmfz7ss2amigbfl2r5w9h87zqn9aq3"; sha256 = "024wxaaxkf7p1i78bh5xrsqmfz7ss2amigbfl2r5w9h87zqn9aq3";
}; };
nativeBuildInputs = [ autoconf automake libtool flex bison pkg-config ]; nativeBuildInputs = [
autoconf
automake
libtool
flex
bison
pkg-config
];
buildInputs = let buildInputs =
mkStatic = lib.flip lib.overrideDerivation (o: { let
dontDisableStatic = true; mkStatic = lib.flip lib.overrideDerivation (o: {
configureFlags = lib.toList (o.configureFlags or []) ++ [ "--enable-static" ]; dontDisableStatic = true;
buildInputs = map mkStatic (o.buildInputs or []); configureFlags = lib.toList (o.configureFlags or [ ]) ++ [ "--enable-static" ];
propagatedBuildInputs = map mkStatic (o.propagatedBuildInputs or []); 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" ]; configureFlags = [ "--disable-shared" ];

View File

@ -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 { }; mingwrt = callPackage ./mingwrt { };
mingw_runtime = mingwrt; mingw_runtime = mingwrt;
mingw_w64 = callPackage ./mingw-w64 { mingw_w64 = callPackage ./mingw-w64 {
stdenv = stdenvNoLibc; stdenv = stdenvNoLibc;
}; };
# FIXME untested with llvmPackages_16 was using llvmPackages_8 # FIXME untested with llvmPackages_16 was using llvmPackages_8
crossThreadsStdenv = overrideCC stdenvNoLibc crossThreadsStdenv = overrideCC stdenvNoLibc (
(if stdenv.hostPlatform.useLLVM or false if stdenv.hostPlatform.useLLVM or false then
then buildPackages.llvmPackages.clangNoLibcxx buildPackages.llvmPackages.clangNoLibcxx
else buildPackages.gccWithoutTargetLibc.override (old: { else
bintools = old.bintools.override { buildPackages.gccWithoutTargetLibc.override (old: {
libc = libcCross; bintools = old.bintools.override {
}; libc = libcCross;
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 { mingw_w64_pthreads = callPackage ./mingw-w64/pthreads.nix { stdenv = crossThreadsStdenv; };
stdenv = crossThreadsStdenv;
};
mcfgthreads = callPackage ./mcfgthreads { mcfgthreads = callPackage ./mcfgthreads { stdenv = crossThreadsStdenv; };
stdenv = crossThreadsStdenv;
};
npiperelay = callPackage ./npiperelay { }; npiperelay = callPackage ./npiperelay { };
pthreads = callPackage ./pthread-w32 { }; pthreads = callPackage ./pthread-w32 { };
libgnurx = callPackage ./libgnurx { }; libgnurx = callPackage ./libgnurx { };
}) }
)

View File

@ -1,4 +1,9 @@
{ stdenv, lib, fetchFromGitHub, cmake }: {
stdenv,
lib,
fetchFromGitHub,
cmake,
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "dlfcn"; pname = "dlfcn";

View File

@ -1,8 +1,13 @@
{ lib, stdenv, fetchurl }: {
lib,
stdenv,
fetchurl,
}:
let let
version = "2.5.1"; version = "2.5.1";
in stdenv.mkDerivation rec { in
stdenv.mkDerivation rec {
pname = "libgnurx"; pname = "libgnurx";
inherit version; inherit version;
src = fetchurl { src = fetchurl {

View File

@ -1,7 +1,8 @@
{ lib {
, stdenv lib,
, fetchFromGitHub stdenv,
, autoreconfHook fetchFromGitHub,
autoreconfHook,
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -15,12 +16,13 @@ stdenv.mkDerivation rec {
hash = "sha256-FrmeaQhwLrNewS0HDlbWgCvVQ5U1l0jrw0YVuQdt9Ck="; hash = "sha256-FrmeaQhwLrNewS0HDlbWgCvVQ5U1l0jrw0YVuQdt9Ck=";
}; };
outputs = [ "out" "dev" ]; outputs = [
"out"
nativeBuildInputs = [ "dev"
autoreconfHook
]; ];
nativeBuildInputs = [ autoreconfHook ];
meta = { meta = {
description = "Threading support library for Windows 7 and above"; description = "Threading support library for Windows 7 and above";
homepage = "https://github.com/lhmouse/mcfgthread/wiki"; homepage = "https://github.com/lhmouse/mcfgthread/wiki";

View File

@ -1,26 +1,31 @@
{ lib {
, stdenv lib,
, windows stdenv,
, autoreconfHook windows,
, mingw_w64_headers autoreconfHook,
mingw_w64_headers,
}: }:
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "mingw-w64"; pname = "mingw-w64";
inherit (mingw_w64_headers) version src meta; inherit (mingw_w64_headers) version src meta;
outputs = [ "out" "dev" ]; outputs = [
"out"
"dev"
];
configureFlags = [ configureFlags = [
"--enable-idl" "--enable-idl"
"--enable-secure-api" "--enable-secure-api"
] ++ lib.optionals (stdenv.targetPlatform.libc == "ucrt") [ ] ++ lib.optionals (stdenv.targetPlatform.libc == "ucrt") [ "--with-default-msvcrt=ucrt" ];
"--with-default-msvcrt=ucrt"
];
enableParallelBuilding = true; enableParallelBuilding = true;
nativeBuildInputs = [ autoreconfHook ]; nativeBuildInputs = [ autoreconfHook ];
buildInputs = [ windows.mingw_w64_headers ]; buildInputs = [ windows.mingw_w64_headers ];
hardeningDisable = [ "stackprotector" "fortify" ]; hardeningDisable = [
"stackprotector"
"fortify"
];
} }

View File

@ -1,4 +1,8 @@
{ lib, stdenvNoCC, fetchurl }: {
lib,
stdenvNoCC,
fetchurl,
}:
stdenvNoCC.mkDerivation (finalAttrs: { stdenvNoCC.mkDerivation (finalAttrs: {
pname = "mingw_w64-headers"; pname = "mingw_w64-headers";

View File

@ -1,4 +1,8 @@
{ stdenv, lib, fetchurl }: {
stdenv,
lib,
fetchurl,
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "mingwrt"; pname = "mingwrt";
@ -14,5 +18,8 @@ stdenv.mkDerivation rec {
}; };
dontStrip = true; dontStrip = true;
hardeningDisable = [ "stackprotector" "fortify" ]; hardeningDisable = [
"stackprotector"
"fortify"
];
} }

View File

@ -1,4 +1,8 @@
{ lib, buildGoModule, fetchFromGitHub }: {
lib,
buildGoModule,
fetchFromGitHub,
}:
buildGoModule rec { buildGoModule rec {
pname = "npiperelay"; pname = "npiperelay";

View File

@ -1,4 +1,8 @@
{ lib, stdenv, fetchzip }: {
lib,
stdenv,
fetchzip,
}:
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "pthreads-w32"; pname = "pthreads-w32";
@ -9,7 +13,10 @@ stdenv.mkDerivation {
sha256 = "1s8iny7g06z289ahdj0kzaxj0cd3wvjbd8j3bh9xlg7g444lhy9w"; sha256 = "1s8iny7g06z289ahdj0kzaxj0cd3wvjbd8j3bh9xlg7g444lhy9w";
}; };
makeFlags = [ "CROSS=${stdenv.cc.targetPrefix}" "GC-static" ]; makeFlags = [
"CROSS=${stdenv.cc.targetPrefix}"
"GC-static"
];
installPhase = '' installPhase = ''
runHook preInstall runHook preInstall

View File

@ -1,4 +1,8 @@
{ stdenv, fetchurl, lib }: {
stdenv,
fetchurl,
lib,
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "w32api"; pname = "w32api";