pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #306469 from jtojnar/gnome-fixes

authored by Maxine Aubrey and committed by GitHub 0f59a441 1b357187

+19 -12
unified split
+10 -12
pkgs/desktops/gnome/misc/gpaste/default.nix
··· 1 1 { stdenv 2 2 , lib 3 - , fetchFromGitHub 3 + , fetchurl 4 4 , gjs 5 5 , glib 6 6 , gobject-introspection ··· 17 17 , wrapGAppsHook 18 18 }: 19 19 20 - stdenv.mkDerivation rec { 21 - version = "45"; 20 + stdenv.mkDerivation (finalAttrs: { 21 + version = "45.1"; 22 22 pname = "gpaste"; 23 23 24 - src = fetchFromGitHub { 25 - owner = "Keruspe"; 26 - repo = "GPaste"; 27 - rev = "v${version}"; 28 - sha256 = "sha256-MpoeLXGdLfas/E3x5ojJW5Dd3H8XZORtFaBHgRGJXxg="; 24 + src = fetchurl { 25 + url = "https://www.imagination-land.org/files/gpaste/GPaste-${finalAttrs.version}.tar.xz"; 26 + hash = "sha256-yYLoHn3/2xlefBeErnydNfkvtJva8/9f9JHhfschBpQ="; 29 27 }; 30 28 31 29 patches = [ ··· 36 34 # https://github.com/NixOS/nix/issues/1846 37 35 postPatch = '' 38 36 substituteInPlace src/libgpaste/gpaste/gpaste-settings.c \ 39 - --subst-var-by gschemasCompiled ${glib.makeSchemaPath (placeholder "out") "${pname}-${version}"} 37 + --subst-var-by gschemasCompiled ${glib.makeSchemaPath (placeholder "out") "${finalAttrs.pname}-${finalAttrs.version}"} 40 38 ''; 41 39 42 40 nativeBuildInputs = [ ··· 81 79 82 80 meta = with lib; { 83 81 homepage = "https://github.com/Keruspe/GPaste"; 84 - description = "Clipboard management system with GNOME 3 integration"; 82 + description = "Clipboard management system with GNOME integration"; 85 83 mainProgram = "gpaste-client"; 86 - license = licenses.gpl3; 84 + license = licenses.bsd2; 87 85 platforms = platforms.linux; 88 86 maintainers = teams.gnome.members; 89 87 }; 90 - } 88 + })
+9
pkgs/os-specific/linux/power-profiles-daemon/default.nix
··· 11 11 , polkit 12 12 , dbus 13 13 , gobject-introspection 14 + , wrapGAppsNoGuiHook 14 15 , gettext 15 16 , gtk-doc 16 17 , docbook-xsl-nons ··· 49 50 libxml2 # for xmllint for stripping GResources 50 51 libxslt # for xsltproc for building docs 51 52 gobject-introspection 53 + wrapGAppsNoGuiHook 52 54 # checkInput but cheked for during the configuring 53 55 (python3.pythonOnBuildForHost.withPackages (ps: with ps; [ 54 56 pygobject3 ··· 94 96 ]; 95 97 96 98 doCheck = true; 99 + 100 + # Only need to wrap the Python tool (powerprofilectl) 101 + dontWrapGApps = true; 97 102 98 103 PKG_CONFIG_POLKIT_GOBJECT_1_POLICYDIR = "${placeholder "out"}/share/polkit-1/actions"; 99 104 ··· 104 109 105 110 patchShebangs --host \ 106 111 src/powerprofilesctl 112 + ''; 113 + 114 + postFixup = '' 115 + wrapGApp "$out/bin/powerprofilesctl" 107 116 ''; 108 117 109 118 passthru = {