Unverified Commit 97787e85 authored by Jan Tojnar's avatar Jan Tojnar Committed by GitHub
Browse files

gpaste: fix GIRepository `prepend_search_path` call, enable for GNOME 49 (#461745)

parents e078a9d3 9f6139b7

pkgs/by-name/gp/gpaste/package.nix

+11 −7
Original line number Diff line number Diff line
@@ -36,6 +36,10 @@ stdenv.mkDerivation (finalAttrs: { 
  postPatch = ''

    substituteInPlace src/libgpaste/gpaste/gpaste-settings.c \

      --subst-var-by gschemasCompiled ${glib.makeSchemaPath (placeholder "out") "${finalAttrs.pname}-${finalAttrs.version}"}



    substituteInPlace src/gnome-shell/metadata.json.in --replace-fail \

      '"shell-version": [ "45", "46", "47", "48" ],' \

      '"shell-version": [ "45", "46", "47", "48", "49" ],'

  '';



  nativeBuildInputs = [
@@ -59,9 +63,9 @@ stdenv.mkDerivation (finalAttrs: { 
  ];



  mesonFlags = [

    "-Dcontrol-center-keybindings-dir=${placeholder "out"}/share/gnome-control-center/keybindings"

    "-Ddbus-services-dir=${placeholder "out"}/share/dbus-1/services"

    "-Dsystemd-user-unit-dir=${placeholder "out"}/etc/systemd/user"

    (lib.mesonOption "control-center-keybindings-dir" "${placeholder "out"}/share/gnome-control-center/keybindings")

    (lib.mesonOption "dbus-services-dir" "${placeholder "out"}/share/dbus-1/services")

    (lib.mesonOption "systemd-user-unit-dir" "${placeholder "out"}/etc/systemd/user")

  ];



  postInstall = ''
@@ -78,13 +82,13 @@ stdenv.mkDerivation (finalAttrs: { 
      --subst-var-by typelibDir "${placeholder "out"}/lib/girepository-1.0"

  '';



  meta = with lib; {

  meta = {

    homepage = "https://github.com/Keruspe/GPaste";

    changelog = "https://github.com/Keruspe/GPaste/blob/v${finalAttrs.version}/NEWS";

    description = "Clipboard management system with GNOME integration";

    mainProgram = "gpaste-client";

    license = licenses.bsd2;

    platforms = platforms.linux;

    teams = [ teams.gnome ];

    license = lib.licenses.bsd2;

    platforms = lib.platforms.linux;

    teams = [ lib.teams.gnome ];

  };

})

pkgs/by-name/gp/gpaste/wrapper.js

+1 −1
Original line number Diff line number Diff line 
import GIRepository from 'gi://GIRepository';



GIRepository.Repository.prepend_search_path('@typelibDir@');

GIRepository.Repository.dup_default().prepend_search_path('@typelibDir@');



export default (await import('./.@originalName@-wrapped.js')).default;