diff --git a/pkgs/by-name/li/libev/package.nix b/pkgs/by-name/li/libev/package.nix index 35ab0f808fcf..8e8435467dae 100644 --- a/pkgs/by-name/li/libev/package.nix +++ b/pkgs/by-name/li/libev/package.nix @@ -36,7 +36,11 @@ stdenv.mkDerivation (finalAttrs: { makeFlags = # doing this in configureFlags causes configure to fail - lib.optional (!static && stdenv.hostPlatform.isCygwin) "LDFLAGS=-no-undefined"; + (lib.optional (!static && stdenv.hostPlatform.isCygwin) "LDFLAGS+=-no-undefined") + ++ (lib.optionals (!static && stdenv.hostPlatform.isWindows) [ + "LDFLAGS+=-no-undefined" + "LDFLAGS+=-lws2_32" + ]); meta = { description = "High-performance event loop/event model with lots of features"; diff --git a/pkgs/by-name/ng/nghttp3/package.nix b/pkgs/by-name/ng/nghttp3/package.nix index 5741d2dd8cc5..0b2e763b567d 100644 --- a/pkgs/by-name/ng/nghttp3/package.nix +++ b/pkgs/by-name/ng/nghttp3/package.nix @@ -26,7 +26,8 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ (lib.cmakeBool "ENABLE_SHARED_LIB" (!stdenv.hostPlatform.isStatic)) (lib.cmakeBool "ENABLE_STATIC_LIB" stdenv.hostPlatform.isStatic) - ]; + ] + ++ (lib.optional stdenv.hostPlatform.isWindows "-DENABLE_LIB_ONLY=1"); doCheck = true; @@ -39,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://github.com/ngtcp2/nghttp3/releases/tag/v${finalAttrs.version}"; description = "Implementation of HTTP/3 mapping over QUIC and QPACK in C"; license = lib.licenses.mit; - platforms = lib.platforms.unix; + platforms = lib.platforms.unix ++ lib.platforms.windows; maintainers = with lib.maintainers; [ izorkin ]; }; }) diff --git a/pkgs/by-name/tz/tzdata/package.nix b/pkgs/by-name/tz/tzdata/package.nix index a92873e965c4..df8c808ba402 100644 --- a/pkgs/by-name/tz/tzdata/package.nix +++ b/pkgs/by-name/tz/tzdata/package.nix @@ -61,6 +61,15 @@ stdenv.mkDerivation (finalAttrs: { "CFLAGS+=-DHAVE_STRUCT_STAT_ST_CTIM=0" "CFLAGS+=-DHAVE_SYMLINK=0" "CFLAGS+=-DRESERVE_STD_EXT_IDS" + # sys/stat.h does exist on Windows for us + "CFLAGS+=-DHAVE_SYS_STAT_H=1" + # It is called st_ctime on windows, this forces that + # choice + "CFLAGS+=-DHAVE_STRUCT_STAT_ST_CTIM=0" + "CFLAGS+=-DHAVE_MEMPCPY=1" + "CFLAGS+=-DHAVE_GETRESUID=0" + "CFLAGS+=-DHAVE_GETEUID=0" + "CFLAGS+=-DHAVE_FCHMOD=0" ] ++ lib.optionals stdenv.hostPlatform.isFreeBSD [ "CFLAGS+=-DNETBSD_INSPIRED=0" diff --git a/pkgs/development/libraries/ngtcp2/default.nix b/pkgs/development/libraries/ngtcp2/default.nix index b05d452fa04d..ef64f8584f54 100644 --- a/pkgs/development/libraries/ngtcp2/default.nix +++ b/pkgs/development/libraries/ngtcp2/default.nix @@ -41,7 +41,10 @@ stdenv.mkDerivation (finalAttrs: { # This works in the dynamic case where the targets have the same name, but not here where they're suffixed with `_static`. # Also, the examples depend on Linux-specific APIs, so we avoid them on FreeBSD/Cygwin too. (lib.cmakeBool "ENABLE_LIB_ONLY" ( - stdenv.hostPlatform.isStatic || stdenv.hostPlatform.isFreeBSD || stdenv.hostPlatform.isCygwin + stdenv.hostPlatform.isStatic + || stdenv.hostPlatform.isFreeBSD + || stdenv.hostPlatform.isCygwin + || stdenv.hostPlatform.isWindows )) (lib.cmakeBool "ENABLE_SHARED_LIB" (!stdenv.hostPlatform.isStatic)) (lib.cmakeBool "ENABLE_STATIC_LIB" stdenv.hostPlatform.isStatic) @@ -58,7 +61,7 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://github.com/ngtcp2/ngtcp2/releases/tag/v${finalAttrs.version}"; description = "Implementation of the QUIC protocol (RFC9000)"; license = lib.licenses.mit; - platforms = lib.platforms.unix; + platforms = lib.platforms.unix ++ lib.platforms.windows; maintainers = with lib.maintainers; [ izorkin ]; }; })