diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2020-04-28 00:08:48 -0400 |
|---|---|---|
| committer | John Cotton Ericson <jcericson@macos-ny-2.office.obsidian.systems> | 2020-05-12 00:44:44 -0400 |
| commit | 1ac5398589916a6a433e845342c9b85c4c52f5dc (patch) | |
| tree | 4e525c4c01cdc5a79105de31d962ba024833f69d /pkgs/os-specific/bsd | |
| parent | f7a93031a284d39e303e98006a82250e3139cee9 (diff) | |
| download | nixpkgs-1ac5398589916a6a433e845342c9b85c4c52f5dc.tar nixpkgs-1ac5398589916a6a433e845342c9b85c4c52f5dc.tar.gz nixpkgs-1ac5398589916a6a433e845342c9b85c4c52f5dc.tar.bz2 nixpkgs-1ac5398589916a6a433e845342c9b85c4c52f5dc.tar.lz nixpkgs-1ac5398589916a6a433e845342c9b85c4c52f5dc.tar.xz nixpkgs-1ac5398589916a6a433e845342c9b85c4c52f5dc.tar.zst nixpkgs-1ac5398589916a6a433e845342c9b85c4c52f5dc.zip | |
*-wrapper; Switch from `infixSalt` to `suffixSalt`
I hate the thing too even though I made it, and rather just get rid of it. But we can't do that yet. In the meantime, this brings us more inline with autoconf and will make it slightly easier for me to write a pkg-config wrapper, which we need.
Diffstat (limited to 'pkgs/os-specific/bsd')
| -rw-r--r-- | pkgs/os-specific/bsd/netbsd/compat-setup-hook.sh | 6 | ||||
| -rw-r--r-- | pkgs/os-specific/bsd/netbsd/fts-setup-hook.sh | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/os-specific/bsd/netbsd/compat-setup-hook.sh b/pkgs/os-specific/bsd/netbsd/compat-setup-hook.sh index 81df09eba17..3c49337a937 100644 --- a/pkgs/os-specific/bsd/netbsd/compat-setup-hook.sh +++ b/pkgs/os-specific/bsd/netbsd/compat-setup-hook.sh @@ -1,6 +1,6 @@ # See pkgs/build-support/setup-hooks/role.bash getHostRole -export NIX_${role_pre}LDFLAGS+=" -lnbcompat" -export NIX_${role_pre}CFLAGS_COMPILE+=" -DHAVE_NBTOOL_CONFIG_H" -export NIX_${role_pre}CFLAGS_COMPILE+=" -include nbtool_config.h" +export NIX_LDFLAGS${role_post}+=" -lnbcompat" +export NIX_CFLAGS_COMPILE${role_post}+=" -DHAVE_NBTOOL_CONFIG_H" +export NIX_CFLAGS_COMPILE${role_post}+=" -include nbtool_config.h" diff --git a/pkgs/os-specific/bsd/netbsd/fts-setup-hook.sh b/pkgs/os-specific/bsd/netbsd/fts-setup-hook.sh index 5cf8c753aec..b6cb5aaca05 100644 --- a/pkgs/os-specific/bsd/netbsd/fts-setup-hook.sh +++ b/pkgs/os-specific/bsd/netbsd/fts-setup-hook.sh @@ -1,4 +1,4 @@ # See pkgs/build-support/setup-hooks/role.bash getHostRole -export NIX_${role_pre}LDFLAGS+=" -lfts" +export NIX_LDFLAGS${role_post}+=" -lfts" |