diff options
author | sternenseemann <sternenseemann@systemli.org> | 2022-04-26 22:17:48 +0200 |
---|---|---|
committer | sternenseemann <sternenseemann@systemli.org> | 2022-05-23 21:25:04 +0200 |
commit | acb063701a6a209a514bbdefacc9bce22332ef60 (patch) | |
tree | 37cfe400a5a5ec8f7792f52060363f7aa5cff213 /pkgs/development/libraries/capnproto | |
parent | fe836f35644a152c5a38d09e162694fec9755b6b (diff) |
lib.systems.elaborate: expose canExecute predicate over isCompatible
canExecute is like isCompatible, but also checks that the Kernels are _equal_, i.e. that both platforms use the same syscall interface. This is crucial in order to actually be able to execute binaries for the other platform. isCompatible is dropped, since it has changed semantically and there's no use case left in nixpkgs.
Diffstat (limited to 'pkgs/development/libraries/capnproto')
-rw-r--r-- | pkgs/development/libraries/capnproto/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/libraries/capnproto/default.nix b/pkgs/development/libraries/capnproto/default.nix index 75b5f14d67ce6..aeb9728af8269 100644 --- a/pkgs/development/libraries/capnproto/default.nix +++ b/pkgs/development/libraries/capnproto/default.nix @@ -17,9 +17,9 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake ] - ++ lib.optional (!(stdenv.hostPlatform.isCompatible stdenv.buildPlatform)) capnproto; + ++ lib.optional (!(stdenv.buildPlatform.canExecute stdenv.hostPlatform)) capnproto; - cmakeFlags = lib.optional (!(stdenv.hostPlatform.isCompatible stdenv.buildPlatform)) "-DEXTERNAL_CAPNP"; + cmakeFlags = lib.optional (!(stdenv.buildPlatform.canExecute stdenv.hostPlatform)) "-DEXTERNAL_CAPNP"; # Upstream 77ac9154440bcc216fda1092fd5bb51da62ae09c, modified to apply to v0.9.1. Drop on update. patches = lib.optional stdenv.hostPlatform.isMusl ./musl-no-fibers.patch; |