git.iko.soy/typeable/nixpkgs
on master help sign in
neovim-qt-unwrapped: init at 2.16.1

more like a refactoring. It was already available but via neovim-qt.passthru.unwrapped Co-authored-by: Sandro <sandro.jaeckel@gmail.com>

commit3a25004f2b33b64b9292d923b1a6257b517157a7 authorMatthieu Coudron <mcoudron@hotmail.com> dateSun 7 Mar 2021, 21:03 (6 years ago) parent841b753
3 files changed+77−74
pkgs/applications/editors/neovim/neovim-qt.nix+43 pkgs/applications/editors/neovim/qt.nix+33−74 pkgs/top-level/all-packages.nix+1
pkgs/applications/editors/neovim/neovim-qt.nixnew file+43
@@ -0,0 +1,43 @@
1+{ lib, stdenv, mkDerivation, fetchFromGitHub, cmake, doxygen, makeWrapper
2+, msgpack, neovim, pythonPackages, qtbase }:
3+
4+mkDerivation rec {
5+ pname = "neovim-qt-unwrapped";
6+ version = "0.2.16.1";
7+
8+ src = fetchFromGitHub {
9+ owner = "equalsraf";
10+ repo = "neovim-qt";
11+ rev = "v${version}";
12+ sha256 = "0x5brrim3f21bzdmh6wyrhrislwpx1248wbx56csvic6v78hzqny";
13+ };
14+
15+ cmakeFlags = [
16+ "-DUSE_SYSTEM_MSGPACK=1"
17+ "-DENABLE_TESTS=0" # tests fail because xcb platform plugin is not found
18+ ];
19+
20+ buildInputs = [
21+ neovim.unwrapped # only used to generate help tags at build time
22+ qtbase
23+ ] ++ (with pythonPackages; [
24+ jinja2 python msgpack
25+ ]);
26+
27+ nativeBuildInputs = [ cmake doxygen ];
28+
29+ preCheck = ''
30+ # The GUI tests require a running X server, disable them
31+ sed -i ../test/CMakeLists.txt -e '/^add_xtest_gui/d'
32+ '';
33+
34+ doCheck = true;
35+
36+ meta = with lib; {
37+ description = "Neovim client library and GUI, in Qt5";
38+ homepage = "https://github.com/equalsraf/neovim-qt";
39+ license = licenses.isc;
40+ maintainers = with maintainers; [ peterhoeg ];
41+ inherit (neovim.meta) platforms;
42+ };
43+}
pkgs/applications/editors/neovim/qt.nix+33−74
@@ -1,79 +1,38 @@
11{ lib, stdenv, mkDerivation, fetchFromGitHub, cmake, doxygen, makeWrapper
2−, msgpack, neovim, pythonPackages, qtbase }:
2+, msgpack, neovim, pythonPackages, qtbase, neovim-qt-unwrapped }:
33
44let
5− unwrapped = mkDerivation rec {
6− pname = "neovim-qt-unwrapped";
7− version = "0.2.16.1";
8−
9− src = fetchFromGitHub {
10− owner = "equalsraf";
11− repo = "neovim-qt";
12− rev = "v${version}";
13− sha256 = "0x5brrim3f21bzdmh6wyrhrislwpx1248wbx56csvic6v78hzqny";
14− };
15−
16− cmakeFlags = [
17− "-DUSE_SYSTEM_MSGPACK=1"
18− "-DENABLE_TESTS=0" # tests fail because xcb platform plugin is not found
19− ];
20−
21− buildInputs = [
22− neovim.unwrapped # only used to generate help tags at build time
23− qtbase
24− ] ++ (with pythonPackages; [
25− jinja2 python msgpack
26− ]);
27−
28− nativeBuildInputs = [ cmake doxygen ];
29−
30− preCheck = ''
31− # The GUI tests require a running X server, disable them
32− sed -i ../test/CMakeLists.txt \
33− -e '/^add_xtest_gui/d'
34− '';
35−
36− doCheck = true;
37−
38− meta = with lib; {
39− description = "Neovim client library and GUI, in Qt5";
40− homepage = "https://github.com/equalsraf/neovim-qt";
41− license = licenses.isc;
42− maintainers = with maintainers; [ peterhoeg ];
43− inherit (neovim.meta) platforms;
44− inherit version;
45− };
46− };
5+ unwrapped = neovim-qt-unwrapped;
476in
48− stdenv.mkDerivation {
49− pname = "neovim-qt";
50− version = unwrapped.version;
51− buildCommand = if stdenv.isDarwin then ''
52− mkdir -p $out/Applications
53− cp -r ${unwrapped}/bin/nvim-qt.app $out/Applications
54−
55− chmod -R a+w "$out/Applications/nvim-qt.app/Contents/MacOS"
56− wrapProgram "$out/Applications/nvim-qt.app/Contents/MacOS/nvim-qt" \
57− --prefix PATH : "${neovim}/bin"
58− '' else ''
59− makeWrapper '${unwrapped}/bin/nvim-qt' "$out/bin/nvim-qt" \
60− --prefix PATH : "${neovim}/bin"
61−
62− # link .desktop file
63− mkdir -p "$out/share/pixmaps"
64− ln -s '${unwrapped}/share/applications' "$out/share/applications"
65− ln -s '${unwrapped}/share/pixmaps/nvim-qt.png' "$out/share/pixmaps/nvim-qt.png"
66− '';
67−
68− preferLocalBuild = true;
69−
70− nativeBuildInputs = [
71− makeWrapper
72− ];
73−
74− passthru = {
75− inherit unwrapped;
76− };
7+stdenv.mkDerivation {
8+ pname = "neovim-qt";
9+ version = unwrapped.version;
10+ buildCommand = if stdenv.isDarwin then ''
11+ mkdir -p $out/Applications
12+ cp -r ${unwrapped}/bin/nvim-qt.app $out/Applications
13+
14+ chmod -R a+w $out/Applications/nvim-qt.app/Contents/MacOS
15+ wrapProgram $out/Applications/nvim-qt.app/Contents/MacOS/nvim-qt \
16+ --prefix PATH : ${neovim}/bin
17+ '' else ''
18+ makeWrapper ${unwrapped}/bin/nvim-qt $out/bin/nvim-qt \
19+ --prefix PATH : ${neovim}/bin
20+
21+ # link .desktop file
22+ mkdir -p $out/share/pixmaps
23+ ln -s ${unwrapped}/share/applications $out/share/applications
24+ ln -s ${unwrapped}/share/pixmaps/nvim-qt.png $out/share/pixmaps/nvim-qt.png
25+ '';
26+
27+ preferLocalBuild = true;
28+
29+ nativeBuildInputs = [
30+ makeWrapper
31+ ];
32+
33+ passthru = {
34+ inherit unwrapped;
35+ };
7736
78− inherit (unwrapped) meta;
79− }
37+ inherit (unwrapped) meta;
38+}
pkgs/top-level/all-packages.nix+1
@@ -25959,6 +25959,7 @@ in
2595925959 neovimUtils = callPackage ../applications/editors/neovim/utils.nix { };
2596025960 neovim = wrapNeovim neovim-unwrapped { };
2596125961
25962+ neovim-qt-unwrapped = libsForQt5.callPackage ../applications/editors/neovim/neovim-qt.nix { };
2596225963 neovim-qt = libsForQt5.callPackage ../applications/editors/neovim/qt.nix { };
2596325964
2596425965 olifant = callPackage ../applications/misc/olifant { };