pyrox.dev
Merge pull request #133439 from ck3d/neovide-fix-freetype
+20
-9
pkgs/applications/editors/neovim/neovide/default.nix
+20
-9
pkgs/applications/editors/neovim/neovide/default.nix
···
3
3
, lib
4
4
, fetchFromGitHub
5
5
, fetchgit
6
+
, fetchurl
6
7
, makeWrapper
7
8
, pkg-config
8
9
, python2
9
-
, expat
10
10
, openssl
11
11
, SDL2
12
12
, fontconfig
13
+
, freetype
13
14
, ninja
14
15
, gn
15
16
, llvmPackages
···
21
22
}:
22
23
rustPlatform.buildRustPackage rec {
23
24
pname = "neovide";
24
-
version = "unstable-2021-06-21";
25
+
version = "unstable-2021-08-08";
25
26
26
27
src = fetchFromGitHub {
27
28
owner = "Kethku";
28
29
repo = "neovide";
29
-
rev = "4159c47ff4f30073b92b9d63fc6ab70e07b74b6d";
30
-
sha256 = "sha256-XwirJGXMGxc/NkpSeHBUc16ppvJ+H4ECnrOVu030Qfg=";
30
+
rev = "725f12cafd4a26babd0d6bbcbca9a99c181991ac";
31
+
sha256 = "sha256-ThMobWKe3wHhR15TmmKrI6Gp1wvGVfJ52MzibK0ubkc=";
31
32
};
32
33
33
-
cargoSha256 = "sha256-WCk9kt81DtBwpEEdKH9gKQSVxAvH+vkyP2y24tU+vzY=";
34
+
cargoSha256 = "sha256-5lOGncnyA8DwetY5bU6k2KXNClFgp+xIBEeA0/iwGF0=";
34
35
35
36
SKIA_SOURCE_DIR =
36
37
let
···
38
39
owner = "rust-skia";
39
40
repo = "skia";
40
41
# see rust-skia:skia-bindings/Cargo.toml#package.metadata skia
41
-
rev = "m90-0.38.3";
42
-
sha256 = "sha256-l8c4vfO1PELAT8bDyr/yQGZetZsaufAlJ6bBOXz7E1w=";
42
+
rev = "m91-0.39.4";
43
+
sha256 = "sha256-ovlR1vEZaQqawwth/UYVUSjFu+kTsywRpRClBaE1CEA=";
43
44
};
44
45
# The externals for skia are taken from skia/DEPS
45
46
externals = lib.mapAttrs (n: v: fetchgit v) (lib.importJSON ./skia-externals.json);
···
79
80
doCheck = false;
80
81
81
82
buildInputs = [
82
-
expat
83
83
openssl
84
84
SDL2
85
-
fontconfig
85
+
(fontconfig.overrideAttrs (old: {
86
+
propagatedBuildInputs = [
87
+
# skia is not compatible with freetype 2.11.0
88
+
(freetype.overrideAttrs (old: rec {
89
+
version = "2.10.4";
90
+
src = fetchurl {
91
+
url = "mirror://savannah/${old.pname}/${old.pname}-${version}.tar.xz";
92
+
sha256 = "112pyy215chg7f7fmp2l9374chhhpihbh8wgpj5nj6avj3c59a46";
93
+
};
94
+
}))
95
+
];
96
+
}))
86
97
];
87
98
88
99
postFixup = ''