ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-26 04:43:09 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #100642 from oxzi/astroid-plugin-fix

Browse Source 
astroid: fix python plugin usage
This commit is contained in:
Sandro 2021-01-13 08:49:29 +01:00 committed by GitHub
commit c7a1cbf5cf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
pkgs/applications/networking/mailreaders/astroid/default.nix
View File

@ -1,12 +1,12 @@
{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, gnome3, gmime3, webkitgtk { lib, stdenv, fetchFromGitHub, cmake, pkg-config, gnome3, gmime3, webkitgtk, ronn
, libsass, notmuch, boost, wrapGAppsHook, glib-networking, protobuf, vim_configurable , libsass, notmuch, boost, wrapGAppsHook, glib-networking, protobuf, vim_configurable
, gtkmm3, libpeas, gsettings-desktop-schemas , gtkmm3, libpeas, gsettings-desktop-schemas, gobject-introspection, python3
, python3, python3Packages
, vim ? vim_configurable.override { # vim to be used, should support the GUI mode.
features = "normal"; , vim ? vim_configurable.override { features = "normal"; gui = "auto"; }
gui = "auto";
} # additional python3 packages to be available within plugins
, ronn , extraPythonPackages ? []
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -20,22 +20,30 @@ stdenv.mkDerivation rec {
sha256 = "11cxbva9ni98gii59xmbxh4c6idcg3mg0pgdsp1c3j0yg7ix0lj3"; sha256 = "11cxbva9ni98gii59xmbxh4c6idcg3mg0pgdsp1c3j0yg7ix0lj3";
}; };
nativeBuildInputs = [ cmake ronn pkgconfig wrapGAppsHook ]; nativeBuildInputs = [
cmake ronn pkg-config wrapGAppsHook gobject-introspection
python3 python3.pkgs.wrapPython
];
buildInputs = [ buildInputs = [
gtkmm3 gmime3 webkitgtk libsass libpeas gtkmm3 gmime3 webkitgtk libsass libpeas
python3 python3Packages.pygobject3 python3
notmuch boost gsettings-desktop-schemas gnome3.adwaita-icon-theme notmuch boost gsettings-desktop-schemas gnome3.adwaita-icon-theme
glib-networking protobuf glib-networking protobuf
] ++ (if vim == null then [] else [ vim ]); vim
];
postPatch = '' postPatch = ''
sed -i "s~gvim ~${vim}/bin/vim -g ~g" src/config.cc sed -i "s~gvim ~${vim}/bin/vim -g ~g" src/config.cc
sed -i "s~ -geom 10x10~~g" src/config.cc sed -i "s~ -geom 10x10~~g" src/config.cc
''; '';
postInstall = '' pythonPath = with python3.pkgs; requiredPythonModules [ pygobject3 ] ++ extraPythonPackages;
wrapProgram "$out/bin/astroid" --set CHARSET=en_us.UTF-8 preFixup = ''
buildPythonPath "$out $pythonPath"
gappsWrapperArgs+=(
--prefix PYTHONPATH : "$program_PYTHONPATH"
)
''; '';
meta = with lib; { meta = with lib; {