diff options
| author | Lily Ballard <lily@sb.org> | 2019-04-16 23:18:13 -0700 |
|---|---|---|
| committer | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2019-04-17 02:18:13 -0400 |
| commit | 1ceef41c298ed187a752f30f6ca58c7b8080fb45 (patch) | |
| tree | 93f339116c43a407d3fe1fb0aef38d1262c07076 /pkgs/tools/misc/watchexec | |
| parent | a846ea54d4d186422fb49ffdf5cf3e12ab2dd5b7 (diff) | |
| download | nixpkgs-1ceef41c298ed187a752f30f6ca58c7b8080fb45.tar nixpkgs-1ceef41c298ed187a752f30f6ca58c7b8080fb45.tar.gz nixpkgs-1ceef41c298ed187a752f30f6ca58c7b8080fb45.tar.bz2 nixpkgs-1ceef41c298ed187a752f30f6ca58c7b8080fb45.tar.lz nixpkgs-1ceef41c298ed187a752f30f6ca58c7b8080fb45.tar.xz nixpkgs-1ceef41c298ed187a752f30f6ca58c7b8080fb45.tar.zst nixpkgs-1ceef41c298ed187a752f30f6ca58c7b8080fb45.zip | |
watchexec: remove Darwin hack in favor of cf-private (#59428)
Diffstat (limited to 'pkgs/tools/misc/watchexec')
| -rw-r--r-- | pkgs/tools/misc/watchexec/default.nix | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/pkgs/tools/misc/watchexec/default.nix b/pkgs/tools/misc/watchexec/default.nix index ddfdf0f492f..b3f5e90c3f4 100644 --- a/pkgs/tools/misc/watchexec/default.nix +++ b/pkgs/tools/misc/watchexec/default.nix @@ -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"; |