max/nix-super
1
0
Fork 0
mirror of https://github.com/privatevoid-net/nix-super.git synced 2024-11-26 15:56:18 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #11750 from artemist/nix-openbsd

Browse source 
Fix building on OpenBSD
This commit is contained in:
Eelco Dolstra 2024-10-27 12:51:38 +01:00 committed by GitHub
commit 059bdb5a64
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
mk/libraries.mk
View file

@ -86,10 +86,12 @@ define build-library
else else
ifndef HOST_DARWIN ifndef HOST_DARWIN
ifndef HOST_WINDOWS ifndef HOST_WINDOWS
ifndef HOST_OPENBSD
$(1)_LDFLAGS += -Wl,-z,defs $(1)_LDFLAGS += -Wl,-z,defs
endif endif
endif endif
endif endif
endif
ifndef HOST_DARWIN ifndef HOST_DARWIN
$(1)_LDFLAGS += -Wl,-soname=$$($(1)_NAME).$(SO_EXT) $(1)_LDFLAGS += -Wl,-soname=$$($(1)_NAME).$(SO_EXT)

4
mk/platform.mk
View file

@ -21,6 +21,10 @@ ifdef HOST_OS
HOST_NETBSD = 1 HOST_NETBSD = 1
HOST_UNIX = 1 HOST_UNIX = 1
endif endif
ifeq ($(patsubst openbsd%,,$(HOST_KERNEL)),)
HOST_OPENBSD = 1
HOST_UNIX = 1
endif
ifeq ($(HOST_KERNEL), linux) ifeq ($(HOST_KERNEL), linux)
HOST_LINUX = 1 HOST_LINUX = 1
HOST_UNIX = 1 HOST_UNIX = 1

4
package.nix
View file

@ -76,7 +76,9 @@
# #
# Temporarily disabled on Windows because the `GC_throw_bad_alloc` # Temporarily disabled on Windows because the `GC_throw_bad_alloc`
# symbol is missing during linking. # symbol is missing during linking.
, enableGC ? !stdenv.hostPlatform.isWindows #
# Disabled on OpenBSD because of missing `_data_start` symbol while linking
, enableGC ? !stdenv.hostPlatform.isWindows && !stdenv.hostPlatform.isOpenBSD
# Whether to enable Markdown rendering in the Nix binary. # Whether to enable Markdown rendering in the Nix binary.
, enableMarkdown ? !stdenv.hostPlatform.isWindows , enableMarkdown ? !stdenv.hostPlatform.isWindows