From 730a9a04facd478381f3911ae668b3b46e349f08 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 18 Apr 2021 20:12:09 +0000 Subject: [PATCH] stdenv.isBSD: reinit 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. --- pkgs/stdenv/generic/default.nix | 2 +- pkgs/tools/misc/ffsend/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index 476fab3eed6..c3582b16677 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -137,7 +137,7 @@ let # Utility flags to test the type of platform. inherit (hostPlatform) - isDarwin isLinux isSunOS isCygwin isFreeBSD isOpenBSD + isDarwin isLinux isSunOS isCygwin isBSD isFreeBSD isOpenBSD isi686 isx86_32 isx86_64 is32bit is64bit isAarch32 isAarch64 isMips isBigEndian; diff --git a/pkgs/tools/misc/ffsend/default.nix b/pkgs/tools/misc/ffsend/default.nix index 4c92a0be792..4e059725f86 100644 --- a/pkgs/tools/misc/ffsend/default.nix +++ b/pkgs/tools/misc/ffsend/default.nix @@ -7,7 +7,7 @@ }: let - usesX11 = stdenv.isLinux || stdenv.hostPlatform.isBSD; + usesX11 = stdenv.isLinux || stdenv.isBSD; in assert (x11Support && usesX11) -> xclip != null || xsel != null;