commit a276404d44bf6b5c11dc17621bfedfa7d6e8ab9c · pyrox.dev/nixpkgs

-35

pkgs/applications/networking/browsers/eolie/0001-Extend-the-python-path-rather-than-replacing-it.patch

···

       1
       1
       -
       From b51b63b78c9ff1639f5f65ccfdd54681f1cadc1d Mon Sep 17 00:00:00 2001

     

       2
       2
       -
       From: Sam Parkinson <sam@sam.today>

     

       3
       3
       -
       Date: Tue, 26 Dec 2017 14:46:27 +1100

     

       4
       4
       -
       Subject: [PATCH] Extend the python path; rather than replacing it

     

       5
       5
       -
       

     

       6
       6
       -
       Some distros (i.e. NixOS) require the special PYTHONPATH, so that

     

       7
       7
       -
       the web extension has access to the python packages it wants (i.e. gi).

     

       8
       8
       -
       

     

       9
       9
       -
       Previously, the PYTHONPATH was replaced with the web extension path;

     

       10
       10
       -
       meaning it would crash on NixOS.  This instead prepends the web

     

       11
       11
       -
       extension path to the PYTHONPATH.

     

       12
       12
       -
       ---

     

       13
       13
       -
        eolie/application.py | 6 +++++-

     

       14
       14
       -
        1 file changed, 5 insertions(+), 1 deletion(-)

     

       15
       15
       -
       

     

       16
       16
       -
       diff --git a/eolie/application.py b/eolie/application.py

     

       17
       17
       -
       index 3c21542..bed4e55 100644

     

       18
       18
       -
       --- a/eolie/application.py

     

       19
       19
       -
       +++ b/eolie/application.py

     

       20
       20
       -
       @@ -340,7 +340,11 @@ class Application(Gtk.Application):

     

       21
       21
       -
                self.settings = Settings.new()

     

       22
       22
       -
        

     

       23
       23
       -
                # Init extensions

     

       24
       24
       -
       -        GLib.setenv("PYTHONPATH", self.__extension_dir, True)

     

       25
       25
       -
       +        current_path = GLib.getenv("PYTHONPATH")

     

       26
       26
       -
       +        new_path = self.__extension_dir

     

       27
       27
       -
       +        if current_path:

     

       28
       28
       -
       +            new_path = new_path + ':' + current_path

     

       29
       29
       -
       +        GLib.setenv("PYTHONPATH", new_path, True)

     

       30
       30
       -
        

     

       31
       31
       -
                # Create favicon path

     

       32
       32
       -
                if not GLib.file_test(self.__FAVICONS_PATH, GLib.FileTest.IS_DIR):

     

       33
       33
       -
       -- 

     

       34
       34
       -
       2.15.0

     

       35
       35
       -

+28 -42

pkgs/applications/networking/browsers/eolie/default.nix

···

       1
       1
       -
       { stdenv, fetchgit, intltool, itstool, meson, ninja, pkgconfig, wrapGAppsHook

     

       2
       2
       -
       , glib, glib-networking, gsettings-desktop-schemas, gst_all_1, gtk3, gobjectIntrospection

     

       3
       3
       -
       , gtkspell3, libsecret, python36, python36Packages, webkitgtk }:

     

       1
       1
       +
       { stdenv, fetchgit, meson, ninja, pkgconfig, wrapGAppsHook

     

       2
       2
       +
       , desktop-file-utils, gobjectIntrospection, python36Packages

     

       3
       3
       +
       , gnome3, gst_all_1, gtkspell3, hunspell }:

     

       4
       4
        
       

     

       5
       5
        
       stdenv.mkDerivation rec {

     

       6
       6
        
         name = "eolie-${version}";

     

       7
       7
       -
         version = "0.9.16";

     

       7
       7
       +
         version = "0.9.35";

     

       8
       8
        
       

     

       9
       9
        
         src = fetchgit {

     

       10
       10
       -
           url = https://gitlab.gnome.org/gnumdk/eolie;

     

       11
       11
       -
           rev = version;

     

       12
       12
       -
           sha256 = "0mvhr6hy4nx7xaq9r9qp5rb0y293kjjryw5ykzb473cr3iwzk25b";

     

       10
       10
       +
           url = "https://gitlab.gnome.org/World/eolie";

     

       11
       11
       +
           rev = "refs/tags/${version}";

     

       12
       12
       +
           fetchSubmodules = true;

     

       13
       13
       +
           sha256 = "0x3p1fgx1fhrnr7vkkpnl34401r6k6xg2mrjff7ncb1k57q522k7";

     

       13
       14
        
         };

     

       14
       15
        
       

     

       15
       15
       -
         nativeBuildInputs = [

     

       16
       16
       -
           intltool

     

       17
       17
       -
           itstool

     

       16
       16
       +
         nativeBuildInputs = with python36Packages; [

     

       17
       17
       +
           desktop-file-utils

     

       18
       18
       +
           gobjectIntrospection

     

       18
       19
        
           meson

     

       19
       20
        
           ninja

     

       20
       21
        
           pkgconfig

     

       21
       22
        
           wrapGAppsHook

     

       22
       22
       -
           gobjectIntrospection

     

       23
       23
       +
           wrapPython

     

       23
       24
        
         ];

     

       24
       25
        
       

     

       25
       25
       -
         buildInputs = [

     

       26
       26
       -
           glib

     

       27
       27
       -
           glib-networking

     

       28
       28
       -
           gsettings-desktop-schemas

     

       29
       29
       -
           gst_all_1.gstreamer

     

       30
       30
       -
           gst_all_1.gst-plugins-base

     

       31
       31
       -
           gst_all_1.gst-plugins-good

     

       32
       32
       -
           gst_all_1.gst-plugins-bad

     

       33
       33
       -
           gst_all_1.gst-plugins-ugly

     

       34
       34
       -
           gst_all_1.gst-libav

     

       35
       35
       -
           gtk3

     

       36
       36
       -
           gtkspell3

     

       37
       37
       -
           libsecret

     

       38
       38
       -
           python36

     

       39
       39
       -
           python36Packages.pygobject3

     

       40
       40
       -
           python36Packages.pycairo

     

       41
       41
       -
           python36Packages.dateutil

     

       42
       42
       -
           python36Packages.dbus-python

     

       43
       43
       -
           python36Packages.beautifulsoup4

     

       44
       44
       -
           python36Packages.pycrypto

     

       45
       45
       -
           python36Packages.requests

     

       46
       46
       -
           webkitgtk

     

       26
       26
       +
         buildInputs = [ gtkspell3 hunspell python36Packages.pygobject3 ] ++ (with gnome3; [

     

       27
       27
       +
           glib glib-networking gsettings_desktop_schemas gtk3 webkitgtk libsecret

     

       28
       28
       +
         ]) ++ (with gst_all_1; [

     

       29
       29
       +
           gst-libav gst-plugins-base gst-plugins-ugly gstreamer

     

       30
       30
       +
         ]);

     

       31
       31
       +
       

     

       32
       32
       +
         pythonPath = with python36Packages; [

     

       33
       33
       +
           beautifulsoup4

     

       34
       34
       +
           pycairo

     

       35
       35
       +
           pygobject3

     

       36
       36
       +
           python-dateutil

     

       47
       37
        
         ];

     

       48
       38
        
       

     

       49
       49
       -
         wrapPrefixVariables = [ "PYTHONPATH" ];

     

       39
       39
       +
         postFixup = "wrapPythonPrograms";

     

       50
       40
        
       

     

       51
       41
        
         postPatch = ''

     

       52
       42
        
           chmod +x meson_post_install.py # patchShebangs requires executable file

     

       53
       43
        
           patchShebangs meson_post_install.py

     

       54
       44
        
         '';

     

       55
       55
       -
       

     

       56
       56
       -
         patches = [

     

       57
       57
       -
           ./0001-Extend-the-python-path-rather-than-replacing-it.patch

     

       58
       58
       -
         ];

     

       59
       45
        
       

     

       60
       46
        
         meta = with stdenv.lib; {

     

       61
       47
        
           description = "A new GNOME web browser";

     

       62
       62
       -
           homepage = https://wiki.gnome.org/Apps/Eolie;

     

       63
       63
       -
           license = licenses.gpl3;

     

       64
       64
       -
           maintainers = [ maintainers.samdroid-apps ];

     

       65
       65
       -
           platforms = platforms.linux;

     

       48
       48
       +
           homepage    = https://wiki.gnome.org/Apps/Eolie;

     

       49
       49
       +
           license     = licenses.gpl3Plus;

     

       50
       50
       +
           maintainers = with maintainers; [ samdroid-apps worldofpeace ];

     

       51
       51
       +
           platforms   = platforms.linux;

     

       66
       52
        
         };

     

       67
       53
        
       }