NixOS/nix
NixOS/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2024-09-19 10:50:24 -04:00
Code Activity

Merge pull request #11221 from pinotree/hurd-fixes

Browse source 
Some fixes for GNU/Hurd
This commit is contained in:
Eelco Dolstra 2024-07-30 13:59:19 +02:00 committed by GitHub
parent 2b78561335 a1ccf60613
commit c77b671a66
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
mk/platform.mk
View file

@ -29,4 +29,8 @@ ifdef HOST_OS
HOST_SOLARIS = 1 HOST_SOLARIS = 1
HOST_UNIX = 1 HOST_UNIX = 1
endif endif
ifeq ($(HOST_KERNEL), gnu)
HOST_HURD = 1
HOST_UNIX = 1
endif
endif endif

2
src/libutil/current-process.cc
View file

@ -137,7 +137,7 @@ std::optional<Path> getSelfExe()
{ {
static auto cached = []() -> std::optional<Path> static auto cached = []() -> std::optional<Path>
{ {
#if __linux__ #if __linux__ || __GNU__
return readLink("/proc/self/exe"); return readLink("/proc/self/exe");
#elif __APPLE__ #elif __APPLE__
char buf[1024]; char buf[1024];

4
tests/unit/libutil/tests.cc
View file

@ -17,6 +17,10 @@
# define FS_ROOT FS_SEP # define FS_ROOT FS_SEP
#endif #endif
#ifndef PATH_MAX
# define PATH_MAX 4096
#endif
namespace nix { namespace nix {
/* ----------- tests for util.hh ------------------------------------------------*/ /* ----------- tests for util.hh ------------------------------------------------*/