Merge staging-next into staging
This commit is contained in:
@@ -11914,7 +11914,7 @@ in
|
||||
duktape = callPackage ../development/interpreters/duktape { };
|
||||
|
||||
evcxr = callPackage ../development/interpreters/evcxr {
|
||||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
inherit (darwin.apple_sdk.frameworks) CoreServices Security;
|
||||
};
|
||||
|
||||
beam = callPackage ./beam-packages.nix { };
|
||||
@@ -15041,7 +15041,9 @@ in
|
||||
|
||||
cairomm = callPackage ../development/libraries/cairomm { };
|
||||
|
||||
cairomm_1_16 = callPackage ../development/libraries/cairomm/1.16.nix { };
|
||||
cairomm_1_16 = callPackage ../development/libraries/cairomm/1.16.nix {
|
||||
inherit (darwin.apple_sdk.frameworks) ApplicationServices;
|
||||
};
|
||||
|
||||
pango = callPackage ../development/libraries/pango {
|
||||
harfbuzz = harfbuzz.override { withCoreText = stdenv.isDarwin; };
|
||||
@@ -26860,6 +26862,8 @@ in
|
||||
|
||||
gnvim = callPackage ../applications/editors/neovim/gnvim/wrapper.nix { };
|
||||
|
||||
neovide = callPackage ../applications/editors/neovim/neovide { };
|
||||
|
||||
neovim-remote = callPackage ../applications/editors/neovim/neovim-remote.nix { };
|
||||
|
||||
vis = callPackage ../applications/editors/vis {
|
||||
|
||||
Reference in New Issue
Block a user