diff options
author | Daiderd Jordan <daiderd@gmail.com> | 2018-11-07 19:10:34 +0100 |
---|---|---|
committer | Daiderd Jordan <daiderd@gmail.com> | 2018-11-07 19:10:34 +0100 |
commit | 16a54d6b2bb9dccb72cf8457719fdaff75352b3b (patch) | |
tree | 162f6ec48653187f1b40124f7b3acedba9956605 | |
parent | 1d0517ddb35e5c0b5a9c6eaa1ce79a3b55821cc3 (diff) | |
download | nixpkgs-16a54d6b2bb9dccb72cf8457719fdaff75352b3b.tar nixpkgs-16a54d6b2bb9dccb72cf8457719fdaff75352b3b.tar.gz nixpkgs-16a54d6b2bb9dccb72cf8457719fdaff75352b3b.tar.bz2 nixpkgs-16a54d6b2bb9dccb72cf8457719fdaff75352b3b.tar.lz nixpkgs-16a54d6b2bb9dccb72cf8457719fdaff75352b3b.tar.xz nixpkgs-16a54d6b2bb9dccb72cf8457719fdaff75352b3b.tar.zst nixpkgs-16a54d6b2bb9dccb72cf8457719fdaff75352b3b.zip |
alacritty: add cf-private on darwin
note: Undefined symbols for architecture x86_64: "_CFURLResourceIsReachable", referenced from: alacritty::config::Monitor::new::_$u7b$$u7b$closure$u7d$$u7d$::h8c82fbfba8a3a673 in alacritty-6a8d3226ed5c4bef.alacritty.9tpyu7jw-cgu.1.rcgu.o "_NSDefaultRunLoopMode", referenced from: alacritty::main::hd6e46019b2208595 in alacritty-6a8d3226ed5c4bef.alacritty.9tpyu7jw-cgu.1.rcgu.o ld: symbol(s) not found for architecture x86_64 clang-5.0: error: linker command failed with exit code 1 (use -v to see invocation)
-rw-r--r-- | pkgs/applications/misc/alacritty/default.nix | 16 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 1 |
2 files changed, 7 insertions, 10 deletions
diff --git a/pkgs/applications/misc/alacritty/default.nix b/pkgs/applications/misc/alacritty/default.nix index 594173f11c6..5237e02f15c 100644 --- a/pkgs/applications/misc/alacritty/default.nix +++ b/pkgs/applications/misc/alacritty/default.nix @@ -18,6 +18,7 @@ libGL, xclip, # Darwin Frameworks + cf-private, AppKit, CoreFoundation, CoreGraphics, @@ -40,15 +41,6 @@ let libGL libXi ]; - darwinFrameworks = [ - AppKit - CoreFoundation - CoreGraphics - CoreServices - CoreText - Foundation - OpenGL - ]; in buildRustPackage rec { name = "alacritty-unstable-${version}"; version = "0.2.1"; @@ -71,7 +63,11 @@ in buildRustPackage rec { ]; buildInputs = rpathLibs - ++ lib.optionals stdenv.isDarwin darwinFrameworks; + ++ lib.optionals stdenv.isDarwin [ + AppKit CoreFoundation CoreGraphics CoreServices CoreText Foundation OpenGL + # Needed for CFURLResourceIsReachable symbols. + cf-private + ]; outputs = [ "out" "terminfo" ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cea917e174b..574e727afba 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -519,6 +519,7 @@ with pkgs; alacritty = callPackage ../applications/misc/alacritty { inherit (xorg) libXcursor libXxf86vm libXi; + inherit (darwin) cf-private; inherit (darwin.apple_sdk.frameworks) AppKit CoreFoundation CoreGraphics CoreServices CoreText Foundation OpenGL; }; |