diff --git a/packaging/dependencies.nix b/packaging/dependencies.nix index 08d179b82..a3d7a73e4 100644 --- a/packaging/dependencies.nix +++ b/packaging/dependencies.nix @@ -75,7 +75,7 @@ let # Users who are debugging Nix builds are expected to set the environment variable `mesonBuildType`, per the # guidance in https://github.com/NixOS/nix/blob/8a3fc27f1b63a08ac983ee46435a56cf49ebaf4a/doc/manual/source/development/debugging.md?plain=1#L10. # For this reason, we don't want to refer to `finalAttrs.mesonBuildType` here, but rather use the environment variable. - preConfigure = prevAttrs.preConfigure or "" + '' + preConfigure = prevAttrs.preConfigure or "" + lib.optionalString (!stdenv.hostPlatform.isWindows) '' case "$mesonBuildType" in release|minsize) appendToVar mesonFlags "-Db_lto=true" ;; *) appendToVar mesonFlags "-Db_lto=false" ;; diff --git a/src/libutil/posix-source-accessor.cc b/src/libutil/posix-source-accessor.cc index 8ee986d3f..70ad6474f 100644 --- a/src/libutil/posix-source-accessor.cc +++ b/src/libutil/posix-source-accessor.cc @@ -124,7 +124,9 @@ std::optional PosixSourceAccessor::maybeLstat(const CanonP S_ISLNK(st->st_mode) ? tSymlink : S_ISCHR(st->st_mode) ? tChar : S_ISBLK(st->st_mode) ? tBlock : +#ifdef S_ISSOCK S_ISSOCK(st->st_mode) ? tSocket : +#endif S_ISFIFO(st->st_mode) ? tFifo : tUnknown, .fileSize = S_ISREG(st->st_mode) ? std::optional(st->st_size) : std::nullopt,