Unverified Commit ce8da798 authored by Bobby Rong's avatar Bobby Rong
Browse files

gedit: 47.0 → 48.0

https://gitlab.gnome.org/World/gedit/gedit/-/compare/47.0...48.0

The snippets plugin is considered buggy and is disabled by default.
parent f85803fd
Loading
Loading
Loading
Loading
+12 −9
Original line number Diff line number Diff line
diff --git a/gedit/meson.build b/gedit/meson.build
index a8683e61a..fc48669f7 100644
index bc689e5..e3b90d8 100644
--- a/gedit/meson.build
+++ b/gedit/meson.build
@@ -191,7 +191,7 @@ libgedit_shared_lib = shared_library(
   c_args: libgedit_c_args,
   link_args: libgedit_link_args,
   install: true,
-  install_dir: get_option('libdir') / 'gedit',
+  install_dir: get_option('prefix') / get_option('libdir') / 'gedit',
 )
@@ -165,9 +165,9 @@ libgedit_private_headers += 'gedit-enum-types-private.h'
 subdir('resources')
 
 # GObject Introspection
 if host_machine.system() == 'windows'
-  libgedit_shared_lib_install_dir = get_option('libdir')
+  libgedit_shared_lib_install_dir = get_option('prefix') / get_option('libdir')
 else
-  libgedit_shared_lib_install_dir = get_option('libdir') / 'gedit'
+  libgedit_shared_lib_install_dir = get_option('prefix') / get_option('libdir') / 'gedit'
 endif
 
 libgedit_shared_lib = shared_library(
+3 −15
Original line number Diff line number Diff line
@@ -4,7 +4,6 @@
, mesonEmulatorHook
, fetchurl
, python3
, python3Packages
, pkg-config
, gtk3
, gtk-mac-integration
@@ -30,13 +29,13 @@

stdenv.mkDerivation rec {
  pname = "gedit";
  version = "47.0";
  version = "48.0";

  outputs = [ "out" "devdoc" ];

  src = fetchurl {
    url = "mirror://gnome/sources/gedit/${lib.versions.major version}/gedit-${version}.tar.xz";
    sha256 = "+kpZfjTHbUrJFDG1rm4ZHJbGsK8XAuCJmrNRme36G/o=";
    sha256 = "/g/vm3sHmRINuGrok6BgA2oTRFNS3tkWm6so04rPDoA=";
  };

  patches = [
@@ -54,7 +53,6 @@ stdenv.mkDerivation rec {
    perl
    pkg-config
    python3
    python3Packages.wrapPython
    vala
    wrapGAppsHook3
    gtk-doc
@@ -87,16 +85,6 @@ stdenv.mkDerivation rec {
  # Reliably fails to generate gedit-file-browser-enum-types.h in time
  enableParallelBuilding = false;

  pythonPath = with python3Packages; [
    # https://github.com/NixOS/nixpkgs/issues/298716
    pycairo
  ];

  postFixup = ''
    buildPythonPath "$pythonPath"
    patchPythonScript $out/lib/gedit/plugins/snippets/document.py
  '';

  passthru = {
    updateScript = gnome.updateScript {
      packageName = "gedit";
@@ -104,7 +92,7 @@ stdenv.mkDerivation rec {
  };

  meta = with lib; {
    homepage = "https://gedit-technology.github.io/apps/gedit/";
    homepage = "https://gitlab.gnome.org/World/gedit/gedit";
    description = "Former GNOME text editor";
    maintainers = with maintainers; [ bobby285271 ];
    license = licenses.gpl2Plus;