wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-07-07 01:51:47 +02:00
Code Activity

Merge pull request #12298 from edolstra/fix-mingw

Browse source 
mingw fixes
This commit is contained in:
mergify[bot] 2025-01-20 14:15:34 +00:00 • committed by GitHub
commit 991be65272
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
packaging/dependencies.nix
View file

@ -75,7 +75,7 @@ let
# Users who are debugging Nix builds are expected to set the environment variable `mesonBuildType`, per the # 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. # 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. # 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 case "$mesonBuildType" in
release|minsize) appendToVar mesonFlags "-Db_lto=true" ;; release|minsize) appendToVar mesonFlags "-Db_lto=true" ;;
*) appendToVar mesonFlags "-Db_lto=false" ;; *) appendToVar mesonFlags "-Db_lto=false" ;;

2
src/libutil/posix-source-accessor.cc
View file

@ -124,7 +124,9 @@ std::optional<SourceAccessor::Stat> PosixSourceAccessor::maybeLstat(const CanonP
S_ISLNK(st->st_mode) ? tSymlink : S_ISLNK(st->st_mode) ? tSymlink :
S_ISCHR(st->st_mode) ? tChar : S_ISCHR(st->st_mode) ? tChar :
S_ISBLK(st->st_mode) ? tBlock : S_ISBLK(st->st_mode) ? tBlock :
#ifdef S_ISSOCK
S_ISSOCK(st->st_mode) ? tSocket : S_ISSOCK(st->st_mode) ? tSocket :
#endif
S_ISFIFO(st->st_mode) ? tFifo : S_ISFIFO(st->st_mode) ? tFifo :
tUnknown, tUnknown,
.fileSize = S_ISREG(st->st_mode) ? std::optional<uint64_t>(st->st_size) : std::nullopt, .fileSize = S_ISREG(st->st_mode) ? std::optional<uint64_t>(st->st_size) : std::nullopt,