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

Merge pull request #119827 from alyssais/isBSD

Browse Source 
stdenv.isBSD: reinit
This commit is contained in:
John Ericson 2021-04-19 13:50:14 -04:00 committed by GitHub
commit b26886474a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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;