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

neovide: ba42855 -> 0b976c3 

Simplify packaging, since upstream applied proposed pull request.
This commit is contained in:
Christian Kögler 2021-05-15 08:19:54 +02:00
parent 428edf7fe0
commit a0bc1ab480
1 changed files with 4 additions and 12 deletions
pkgs/applications/editors/neovim/neovide
default.nix

16
pkgs/applications/editors/neovim/neovide/default.nix
View File

@ -18,39 +18,31 @@
}: }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "neovide"; pname = "neovide";
version = "20210503"; version = "20210515";
src = src =
let let
repo = fetchFromGitHub { repo = fetchFromGitHub {
owner = "Kethku"; owner = "Kethku";
repo = "neovide"; repo = "neovide";
rev = "ba42855f4c0f8b8b35c8cfd2c0572241f2a0112e"; rev = "0b976c3d28bbd24e6c83a2efc077aa96dde1e9eb";
sha256 = "sha256-DQrkdm8K09gCIYJHpQB6wBs4Jqee0aMklSw3eba+4qQ="; sha256 = "sha256-asaOxcAenKdy/yJvch3HFfgnrBnQagL02UpWYnz7sa8=";
}; };
in in
runCommand "source" { } '' runCommand "source" { } ''
cp -R ${repo} $out cp -R ${repo} $out
chmod -R +w $out chmod -R +w $out
# Reasons for patching Cargo.toml: # Reasons for patching Cargo.toml:
# - For package sdl2-sys disable feature bundled, which is pulled in by
# target windows and can not be disabled with cargo resolver version 1.
# By updating resolver to version 2, the features are disabled. See
# also:
# https://doc.rust-lang.org/cargo/reference/resolver.html#feature-resolver-version-2
# This change is proposed upstream in following PR:
# https://github.com/Kethku/neovide/pull/652
# - I got neovide built with latest compatible skia-save version 0.35.1 # - I got neovide built with latest compatible skia-save version 0.35.1
# and I did not try to get it with 0.32.1 working. Changing the skia # and I did not try to get it with 0.32.1 working. Changing the skia
# version is time consuming, because of manual dependecy tracking and # version is time consuming, because of manual dependecy tracking and
# long compilation runs. # long compilation runs.
sed -i $out/Cargo.toml \ sed -i $out/Cargo.toml \
-e '/\[package\]/a resolver = "2"' \
-e '/skia-safe/s;0.32.1;0.35.1;' -e '/skia-safe/s;0.32.1;0.35.1;'
cp ${./Cargo.lock} $out/Cargo.lock cp ${./Cargo.lock} $out/Cargo.lock
''; '';
cargoSha256 = "sha256-DsRXpsCH4Y2vk54QT5n/5YQAcXLKIqRfvOcrOdZmccU="; cargoSha256 = "sha256-XMPRM3BAfCleS0LXQv03A3lQhlUhAP8/9PdVbAUnfG0=";
SKIA_OFFLINE_SOURCE_DIR = SKIA_OFFLINE_SOURCE_DIR =
let let