Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

neovide: 0b976c3 -> 4159c47f #127506

Merged
merged 2 commits into from
Jun 26, 2021
Merged

neovide: 0b976c3 -> 4159c47f #127506

merged 2 commits into from
Jun 26, 2021

Conversation

ck3d
Copy link
Contributor

@ck3d ck3d commented Jun 19, 2021

Neovide moved from Vulkan to OpenGL (neovide/neovide#655) which has better GPU support.
This version should make #123262 obsolete.

The new version has one issues on my environment:

  • The shift key only works for keys a-z. I can not type e.g. !@#?

If we merge this PR, Nix users can give feedback to the Neovide project.
But I am OK, when we wait for a more tested version.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • 21.11 Release Notes
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

@ck3d ck3d requested review from jonringer and teto as code owners June 19, 2021 22:08
@ofborg ofborg bot added 11.by: package-maintainer This PR was created by the maintainer of the package it changes 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 10.rebuild-linux: 1 labels Jun 19, 2021
@gebner
Copy link
Member

gebner commented Jun 20, 2021

The new version has one issues on my environment:

  • The shift key only works for keys a-z. I can not type e.g. !@#?

I've also experienced this issue the last time I tried out the opengl branch, this makes neovide pretty unusable (to be fair, the vulkan version doesn't run at all here so it would strictly speaking still be an improvement for me).

Maybe we should wait for this PR to be merged first?
neovide/neovide#736

@shaunsingh
Copy link

We will likely make a stable release after neovide/neovide#736 is merged and linux keyboard issues are resolved. After that neovide should become much more usable on linux. I would personally wait until the stable release, but its up to you.

@ck3d ck3d changed the title neovide: 0b976c3 -> 599dc58 neovide: 0b976c3 -> 599dc58 WIP Jun 21, 2021
@ck3d
Copy link
Contributor Author

ck3d commented Jun 21, 2021

Thanks for your comments. Lets wait for the keyboard issue.

@SuperSandro2000 SuperSandro2000 marked this pull request as draft June 21, 2021 09:04
@bnjmnt4n
Copy link
Contributor

FYI: neovide/neovide#736 has been merged, and it works pretty well on my machine.

--prefix LD_LIBRARY_PATH : ${vulkan-loader}/lib
'';
wrapProgram $out/bin/neovide \
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libglvnd xorg.libXcursor xorg.libXext xorg.libXrandr xorg.libXi ]}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I also added wayland and libxkbcommon to allow Neovide to run without XWayland on Sway.

@teto
Copy link
Member

teto commented Jun 22, 2021

I had to change cargoSha256 and then I got

Validating consistency between /build/source//Cargo.lock and /build/neovide-unstable-2021-06-18-vendor.tar.gz/Cargo.lock
3,4d2
< version = 3
< 
1497a1496
>  "clap",

ERROR: cargoSha256 is out of date

Cargo.lock is not the same in neovide-unstable-2021-06-18-vendor.tar.gz

To fix the issue:
1. Use "0000000000000000000000000000000000000000000000000000" as the cargoSha256 value
2. Build the derivation and wait for it to fail with a hash mismatch
3. Copy the 'got: sha256:' value back into the cargoSha256 field

@tomcur
Copy link
Contributor

tomcur commented Jun 22, 2021

With this patch applied to this PR, the latest Neovide commit (neovide/neovide@4159c47) works on my machine.

--- a/default.nix	2021-06-22 13:22:11.259429723 +0100
+++ b/default.nix	2021-06-22 13:23:29.360111759 +0100
@@ -15,6 +15,7 @@
 , llvmPackages
 , makeFontsConf
 , libglvnd
+, libxkbcommon
 , xorg
 }:
 rustPlatform.buildRustPackage rec {
@@ -24,11 +25,11 @@
   src = fetchFromGitHub {
     owner = "Kethku";
     repo = "neovide";
-    rev = "599dc5887d8799ae8971259bc3bdbaa7b6e2ef45";
-    sha256 = "sha256-mwIJ9kI0N6W/3km8H6TdDfSO3TdLg+A/5DSxejRg3i8=";
+    rev = "4159c47ff4f30073b92b9d63fc6ab70e07b74b6d";
+    sha256 = "sha256-XwirJGXMGxc/NkpSeHBUc16ppvJ+H4ECnrOVu030Qfg=";
   };

-  cargoSha256 = "sha256-Fg2cDwjW6Ex5uUZ8226kgNd/6EoeJddp/rULqH70NRs=";
+  cargoSha256 = "sha256-w9xpNvdUZEOUeM+nTY7RjaVTYC9AahEMt5Igq37N7Bo=";

   SKIA_SOURCE_DIR =
     let
@@ -85,7 +86,7 @@

   postFixup = ''
       wrapProgram $out/bin/neovide \
-        --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libglvnd xorg.libXcursor xorg.libXext xorg.libXrandr xorg.libXi ]}
+        --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libglvnd libxkbcommon xorg.libXcursor xorg.libXext xorg.libXrandr xorg.libXi ]}
     '';

   postInstall = ''

ck3d added 2 commits June 22, 2021 20:18
Neovide moved from Vulkan to OpenGL which has better GPU support.
@ck3d ck3d force-pushed the neovide-opengl branch from 7e49465 to b726f3b Compare June 22, 2021 19:14
@ck3d ck3d changed the title neovide: 0b976c3 -> 599dc58 WIP neovide: 0b976c3 -> 4159c47f Jun 22, 2021
@ck3d
Copy link
Contributor Author

ck3d commented Jun 22, 2021

Thanks for the patch. The cargo hash was different, but the rest works. Regarding wayland support, please raise a separate PR. I can not test it.

@teto
Copy link
Member

teto commented Jun 22, 2021

hell yeah that's freaking cool, neovide is finally usable here ! thanks for the work !

@ck3d
Copy link
Contributor Author

ck3d commented Jun 22, 2021

The outdated cargo hashes came from package name changes. A dependency which I didn't know.

@tomcur
Copy link
Contributor

tomcur commented Jun 23, 2021

Thank you, it works!

@ck3d ck3d marked this pull request as ready for review June 26, 2021 05:23
@ck3d
Copy link
Contributor Author

ck3d commented Jun 26, 2021

Sorry, I did not recognize the draft state of my PR. Can somebody please merge this PR.

@teto teto merged commit 64d2892 into NixOS:master Jun 26, 2021
@bnjmnt4n
Copy link
Contributor

👍 I'll send a separate PR enabling Wayland support.

# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 10.rebuild-linux: 1 11.by: package-maintainer This PR was created by the maintainer of the package it changes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants