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

watchexec: remove Darwin hack in favor of cf-private (#59428)

Browse Source
This commit is contained in:
Lily Ballard 2019-04-16 23:18:13 -07:00 committed by Dmitry Kalinkin
parent a846ea54d4
commit 1ceef41c29
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/tools/misc/watchexec/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, rustPlatform, fetchFromGitHub, CoreServices, CoreFoundation }:
{ stdenv, rustPlatform, fetchFromGitHub, CoreServices, darwin }:
rustPlatform.buildRustPackage rec {
name = "watchexec-${version}";
@ -13,13 +13,11 @@ rustPlatform.buildRustPackage rec {
cargoSha256 = "1xlcfr2q2pw47sav9iryjva7w9chv90g18hszq8s0q0w71sccv6j";
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices ];
# FIXME: Use impure version of CoreFoundation because of missing symbols.
# Undefined symbols for architecture x86_64: "_CFURLResourceIsReachable"
preConfigure = stdenv.lib.optionalString stdenv.isDarwin ''
export NIX_LDFLAGS="-F${CoreFoundation}/Library/Frameworks -framework CoreFoundation $NIX_LDFLAGS"
'';
buildInputs = stdenv.lib.optionals stdenv.isDarwin [
CoreServices
# This is needed to avoid an undefined symbol error "_CFURLResourceIsReachable"
darwin.cf-private
];
meta = with stdenv.lib; {
description = "Executes commands in response to file modifications";

2
pkgs/top-level/all-packages.nix
View File

@ -6282,7 +6282,7 @@ in
wal_e = callPackage ../tools/backup/wal-e { };
watchexec = callPackage ../tools/misc/watchexec {
inherit (darwin.apple_sdk.frameworks) CoreServices CoreFoundation;
inherit (darwin.apple_sdk.frameworks) CoreServices;
};
watchman = callPackage ../development/tools/watchman {