cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

gnome.gpaste: 3.42.6 → 42.0

Browse source 
https://www.imagination-land.org/posts/2022-03-19-gpaste-42.0-released.html
This commit is contained in:
Jan Tojnar 2022-03-20 06:12:03 +01:00
parent 27d52bf401
commit a0d22d2ada
2 changed files with 22 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
pkgs/desktops/gnome/misc/gpaste/default.nix
View file

@ -1,4 +1,5 @@
{ lib, stdenv { stdenv
, lib
, fetchFromGitHub , fetchFromGitHub
, fetchpatch , fetchpatch
, appstream-glib , appstream-glib
@ -7,6 +8,8 @@
, glib , glib
, gobject-introspection , gobject-introspection
, gtk3 , gtk3
, gtk4
, libadwaita
, meson , meson
, mutter , mutter
, ninja , ninja
@ -17,14 +20,14 @@
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "3.42.6"; version = "42.0";
pname = "gpaste"; pname = "gpaste";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Keruspe"; owner = "Keruspe";
repo = "GPaste"; repo = "GPaste";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-dCeNWdHj3bBGJR1VpJtQjSn601Vdl3f9FjHAPB2wuhE="; sha256 = "sha256-dwL06BL6P8fqvAfrYpifqMAh6d+3Er6RhUeP6nfCr1M=";
}; };
patches = [ patches = [
@ -38,7 +41,7 @@ stdenv.mkDerivation rec {
--subst-var-by typelibPath "${placeholder "out"}/lib/girepository-1.0" --subst-var-by typelibPath "${placeholder "out"}/lib/girepository-1.0"
substituteInPlace src/gnome-shell/prefs.js \ substituteInPlace src/gnome-shell/prefs.js \
--subst-var-by typelibPath "${placeholder "out"}/lib/girepository-1.0" --subst-var-by typelibPath "${placeholder "out"}/lib/girepository-1.0"
substituteInPlace src/libgpaste/settings/gpaste-settings.c \ substituteInPlace src/libgpaste/gpaste/gpaste-settings.c \
--subst-var-by gschemasCompiled ${glib.makeSchemaPath (placeholder "out") "${pname}-${version}"} --subst-var-by gschemasCompiled ${glib.makeSchemaPath (placeholder "out") "${pname}-${version}"}
''; '';
@ -57,6 +60,8 @@ stdenv.mkDerivation rec {
gjs gjs
glib glib
gtk3 gtk3
gtk4
libadwaita
mutter mutter
pango pango
]; ];

20
pkgs/desktops/gnome/misc/gpaste/fix-paths.patch
View file

@ -1,3 +1,5 @@
diff --git a/src/gnome-shell/extension.js b/src/gnome-shell/extension.js
index c8773fd6..9efbed67 100644
--- a/src/gnome-shell/extension.js --- a/src/gnome-shell/extension.js
+++ b/src/gnome-shell/extension.js +++ b/src/gnome-shell/extension.js
@@ -6,6 +6,8 @@ @@ -6,6 +6,8 @@
@ -8,21 +10,25 @@
+ +
imports.gi.versions.Clutter = Config.LIBMUTTER_API_VERSION; imports.gi.versions.Clutter = Config.LIBMUTTER_API_VERSION;
imports.gi.versions.GLib = '2.0'; imports.gi.versions.GLib = '2.0';
imports.gi.versions.GPaste = '1.0'; imports.gi.versions.GPaste = '2';
diff --git a/src/gnome-shell/prefs.js b/src/gnome-shell/prefs.js
index 32244ab2..74b85572 100644
--- a/src/gnome-shell/prefs.js --- a/src/gnome-shell/prefs.js
+++ b/src/gnome-shell/prefs.js +++ b/src/gnome-shell/prefs.js
@@ -6,6 +6,8 @@ @@ -6,6 +6,8 @@
const Gettext = imports.gettext; imports.gi.versions.GPasteGtk = '4';
+imports.gi.GIRepository.Repository.prepend_search_path('@typelibPath@'); +imports.gi.GIRepository.Repository.prepend_search_path('@typelibPath@');
+ +
//const { GPaste } = imports.gi;
const ExtensionUtils = imports.misc.extensionUtils; const ExtensionUtils = imports.misc.extensionUtils;
--- a/src/libgpaste/settings/gpaste-settings.c
+++ b/src/libgpaste/settings/gpaste-settings.c const { GPasteGtk } = imports.gi;
@@ -1013,7 +1013,11 @@ diff --git a/src/libgpaste/gpaste/gpaste-settings.c b/src/libgpaste/gpaste/gpaste-settings.c
index 7e53eb64..57c399fc 100644
--- a/src/libgpaste/gpaste/gpaste-settings.c
+++ b/src/libgpaste/gpaste/gpaste-settings.c
@@ -1013,7 +1013,11 @@ create_g_settings (void)
} }
else else
{ {