public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

stdenv.isBSD: reinit

Browse Source 
This was removed in e29b0da9c7492732e0dc5730c3da754baa57a1a2, because
it was felt it was ambiguous whether isBSD should remove Darwin.

I think it should be reintroduced.  Packages sometimes have their own
concepts of "is BSD" e.g. Lua, and these almost never include Darwin,
so let's keep Darwin excluded.

Without a way to say "is this BSD", one has to list all flavours of
BSD seperately, even though fundamentally they're still extremely
similar.  I don't want to have to write the following!

    stdenv.isFreeBSD || stdenv.isNetBSD || stdenv.isOpenBSD || stdenv.isDragonFlyBSD

Additionally, we've had stdenv.hostPlatform.isBSD this whole time, and
it hasn't hurt anything.
This commit is contained in:
Alyssa Ross 2021-04-18 20:12:09 +00:00
parent 3d703cfc9e
commit 730a9a04fa
No known key found for this signature in database
GPG Key ID: F9DBED4859B271C0
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/stdenv/generic/default.nix
View File

@ -137,7 +137,7 @@ let
# Utility flags to test the type of platform. # Utility flags to test the type of platform.
inherit (hostPlatform) inherit (hostPlatform)
isDarwin isLinux isSunOS isCygwin isFreeBSD isOpenBSD isDarwin isLinux isSunOS isCygwin isBSD isFreeBSD isOpenBSD
isi686 isx86_32 isx86_64 isi686 isx86_32 isx86_64
is32bit is64bit is32bit is64bit
isAarch32 isAarch64 isMips isBigEndian; isAarch32 isAarch64 isMips isBigEndian;

2
pkgs/tools/misc/ffsend/default.nix
View File

@ -7,7 +7,7 @@
}: }:
let let
usesX11 = stdenv.isLinux || stdenv.hostPlatform.isBSD; usesX11 = stdenv.isLinux || stdenv.isBSD;
in in
assert (x11Support && usesX11) -> xclip != null || xsel != null; assert (x11Support && usesX11) -> xclip != null || xsel != null;