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