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

neovim-qt-unwrapped: init at 2.16.1

Browse Source 
more like a refactoring. It was already available but via neovim-qt.passthru.unwrapped

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
This commit is contained in:
Matthieu Coudron 2021-03-07 21:03:44 +01:00 committed by Matthieu Coudron
parent 841b753e92
commit 3a25004f2b
3 changed files with 72 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
pkgs/applications/editors/neovim/neovim-qt.nix Normal file
View File

@ -0,0 +1,43 @@
{ lib, stdenv, mkDerivation, fetchFromGitHub, cmake, doxygen, makeWrapper
, msgpack, neovim, pythonPackages, qtbase }:
mkDerivation rec {
pname = "neovim-qt-unwrapped";
version = "0.2.16.1";
src = fetchFromGitHub {
owner = "equalsraf";
repo = "neovim-qt";
rev = "v${version}";
sha256 = "0x5brrim3f21bzdmh6wyrhrislwpx1248wbx56csvic6v78hzqny";
};
cmakeFlags = [
"-DUSE_SYSTEM_MSGPACK=1"
"-DENABLE_TESTS=0" # tests fail because xcb platform plugin is not found
];
buildInputs = [
neovim.unwrapped # only used to generate help tags at build time
qtbase
] ++ (with pythonPackages; [
jinja2 python msgpack
]);
nativeBuildInputs = [ cmake doxygen ];
preCheck = ''
# The GUI tests require a running X server, disable them
sed -i ../test/CMakeLists.txt -e '/^add_xtest_gui/d'
'';
doCheck = true;
meta = with lib; {
description = "Neovim client library and GUI, in Qt5";
homepage = "https://github.com/equalsraf/neovim-qt";
license = licenses.isc;
maintainers = with maintainers; [ peterhoeg ];
inherit (neovim.meta) platforms;
};
}

65
pkgs/applications/editors/neovim/qt.nix
View File

@ -1,68 +1,27 @@
{ lib, stdenv, mkDerivation, fetchFromGitHub, cmake, doxygen, makeWrapper { lib, stdenv, mkDerivation, fetchFromGitHub, cmake, doxygen, makeWrapper
, msgpack, neovim, pythonPackages, qtbase }: , msgpack, neovim, pythonPackages, qtbase, neovim-qt-unwrapped }:
let let
unwrapped = mkDerivation rec { unwrapped = neovim-qt-unwrapped;
pname = "neovim-qt-unwrapped";
version = "0.2.16.1";
src = fetchFromGitHub {
owner = "equalsraf";
repo = "neovim-qt";
rev = "v${version}";
sha256 = "0x5brrim3f21bzdmh6wyrhrislwpx1248wbx56csvic6v78hzqny";
};
cmakeFlags = [
"-DUSE_SYSTEM_MSGPACK=1"
"-DENABLE_TESTS=0" # tests fail because xcb platform plugin is not found
];
buildInputs = [
neovim.unwrapped # only used to generate help tags at build time
qtbase
] ++ (with pythonPackages; [
jinja2 python msgpack
]);
nativeBuildInputs = [ cmake doxygen ];
preCheck = ''
# The GUI tests require a running X server, disable them
sed -i ../test/CMakeLists.txt \
-e '/^add_xtest_gui/d'
'';
doCheck = true;
meta = with lib; {
description = "Neovim client library and GUI, in Qt5";
homepage = "https://github.com/equalsraf/neovim-qt";
license = licenses.isc;
maintainers = with maintainers; [ peterhoeg ];
inherit (neovim.meta) platforms;
inherit version;
};
};
in in
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "neovim-qt"; pname = "neovim-qt";
version = unwrapped.version; version = unwrapped.version;
buildCommand = if stdenv.isDarwin then '' buildCommand = if stdenv.isDarwin then ''
mkdir -p $out/Applications mkdir -p $out/Applications
cp -r ${unwrapped}/bin/nvim-qt.app $out/Applications cp -r ${unwrapped}/bin/nvim-qt.app $out/Applications
chmod -R a+w "$out/Applications/nvim-qt.app/Contents/MacOS" chmod -R a+w $out/Applications/nvim-qt.app/Contents/MacOS
wrapProgram "$out/Applications/nvim-qt.app/Contents/MacOS/nvim-qt" \ wrapProgram $out/Applications/nvim-qt.app/Contents/MacOS/nvim-qt \
--prefix PATH : "${neovim}/bin" --prefix PATH : ${neovim}/bin
'' else '' '' else ''
makeWrapper '${unwrapped}/bin/nvim-qt' "$out/bin/nvim-qt" \ makeWrapper ${unwrapped}/bin/nvim-qt $out/bin/nvim-qt \
--prefix PATH : "${neovim}/bin" --prefix PATH : ${neovim}/bin
# link .desktop file # link .desktop file
mkdir -p "$out/share/pixmaps" mkdir -p $out/share/pixmaps
ln -s '${unwrapped}/share/applications' "$out/share/applications" ln -s ${unwrapped}/share/applications $out/share/applications
ln -s '${unwrapped}/share/pixmaps/nvim-qt.png' "$out/share/pixmaps/nvim-qt.png" ln -s ${unwrapped}/share/pixmaps/nvim-qt.png $out/share/pixmaps/nvim-qt.png
''; '';
preferLocalBuild = true; preferLocalBuild = true;
@ -76,4 +35,4 @@ in
}; };
inherit (unwrapped) meta; inherit (unwrapped) meta;
} }

1
pkgs/top-level/all-packages.nix
View File

@ -25959,6 +25959,7 @@ in
neovimUtils = callPackage ../applications/editors/neovim/utils.nix { }; neovimUtils = callPackage ../applications/editors/neovim/utils.nix { };
neovim = wrapNeovim neovim-unwrapped { }; neovim = wrapNeovim neovim-unwrapped { };
neovim-qt-unwrapped = libsForQt5.callPackage ../applications/editors/neovim/neovim-qt.nix { };
neovim-qt = libsForQt5.callPackage ../applications/editors/neovim/qt.nix { }; neovim-qt = libsForQt5.callPackage ../applications/editors/neovim/qt.nix { };
olifant = callPackage ../applications/misc/olifant { }; olifant = callPackage ../applications/misc/olifant { };