Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

GNOME 46 fixes #306469

Merged
merged 2 commits into from
Apr 24, 2024
Merged

GNOME 46 fixes #306469

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eb8c295
power-profiles-daemon: Fix missing typelib
jtojnar Apr 24, 2024
c036e6c
gnome.gpaste: 45 → 45.1
jtojnar Apr 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 10 additions & 12 deletions pkgs/desktops/gnome/misc/gpaste/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{ stdenv
, lib
, fetchFromGitHub
, fetchurl
, gjs
, glib
, gobject-introspection
Expand All @@ -17,15 +17,13 @@
, wrapGAppsHook
}:

stdenv.mkDerivation rec {
version = "45";
stdenv.mkDerivation (finalAttrs: {
version = "45.1";
pname = "gpaste";

src = fetchFromGitHub {
owner = "Keruspe";
repo = "GPaste";
rev = "v${version}";
sha256 = "sha256-MpoeLXGdLfas/E3x5ojJW5Dd3H8XZORtFaBHgRGJXxg=";
src = fetchurl {
url = "https://www.imagination-land.org/files/gpaste/GPaste-${finalAttrs.version}.tar.xz";
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This really does look dodgy, thanks for the comment confirming you verified the contents.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It always promoted tarballs hosted on the author’s website. We just ignored them.

There is an issue requesting for the tag: Keruspe/GPaste#443

hash = "sha256-yYLoHn3/2xlefBeErnydNfkvtJva8/9f9JHhfschBpQ=";
};

patches = [
Expand All @@ -36,7 +34,7 @@ stdenv.mkDerivation rec {
# https://github.com/NixOS/nix/issues/1846
postPatch = ''
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") "${finalAttrs.pname}-${finalAttrs.version}"}
'';

nativeBuildInputs = [
Expand Down Expand Up @@ -81,10 +79,10 @@ stdenv.mkDerivation rec {

meta = with lib; {
homepage = "https://github.com/Keruspe/GPaste";
description = "Clipboard management system with GNOME 3 integration";
description = "Clipboard management system with GNOME integration";
mainProgram = "gpaste-client";
license = licenses.gpl3;
license = licenses.bsd2;
platforms = platforms.linux;
maintainers = teams.gnome.members;
};
}
})
9 changes: 9 additions & 0 deletions pkgs/os-specific/linux/power-profiles-daemon/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
, polkit
, dbus
, gobject-introspection
, wrapGAppsNoGuiHook
, gettext
, gtk-doc
, docbook-xsl-nons
Expand Down Expand Up @@ -49,6 +50,7 @@ stdenv.mkDerivation rec {
libxml2 # for xmllint for stripping GResources
libxslt # for xsltproc for building docs
gobject-introspection
wrapGAppsNoGuiHook
# checkInput but cheked for during the configuring
(python3.pythonOnBuildForHost.withPackages (ps: with ps; [
pygobject3
Expand Down Expand Up @@ -95,6 +97,9 @@ stdenv.mkDerivation rec {

doCheck = true;

# Only need to wrap the Python tool (powerprofilectl)
dontWrapGApps = true;

PKG_CONFIG_POLKIT_GOBJECT_1_POLICYDIR = "${placeholder "out"}/share/polkit-1/actions";

postPatch = ''
Expand All @@ -106,6 +111,10 @@ stdenv.mkDerivation rec {
src/powerprofilesctl
'';

postFixup = ''
wrapGApp "$out/bin/powerprofilesctl"
'';

passthru = {
tests = {
nixos = nixosTests.power-profiles-daemon;
Expand Down