Merge pull request #138428 from bobby285271/pantheon-tweaks

pantheon-tweaks: init at 1.0.1
This commit is contained in:
davidak 2021-09-19 02:47:37 +02:00 committed by GitHub
commit a0d68379c2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 112 additions and 0 deletions

View file

@ -273,6 +273,13 @@
<link linkend="opt-services.touchegg.enable">services.touchegg</link>.
</para>
</listitem>
<listitem>
<para>
<link xlink:href="https://github.com/pantheon-tweaks/pantheon-tweaks">pantheon-tweaks</link>,
an unofficial system settings panel for Pantheon. Available as
<link linkend="opt-programs.pantheon-tweaks.enable">programs.pantheon-tweaks</link>.
</para>
</listitem>
</itemizedlist>
</section>
<section xml:id="sec-release-21.11-incompatibilities">

View file

@ -86,6 +86,8 @@ subsonic-compatible api. Available as [navidrome](#opt-services.navidrome.enable
- [touchegg](https://github.com/JoseExposito/touchegg), a multi-touch gesture recognizer. Available as [services.touchegg](#opt-services.touchegg.enable).
- [pantheon-tweaks](https://github.com/pantheon-tweaks/pantheon-tweaks), an unofficial system settings panel for Pantheon. Available as [programs.pantheon-tweaks](#opt-programs.pantheon-tweaks.enable).
## Backward Incompatibilities {#sec-release-21.11-incompatibilities}
- The `security.wrappers` option now requires to always specify an owner, group and whether the setuid/setgid bit should be set.

View file

@ -171,6 +171,7 @@
./programs/npm.nix
./programs/noisetorch.nix
./programs/oblogout.nix
./programs/pantheon-tweaks.nix
./programs/partition-manager.nix
./programs/plotinus.nix
./programs/proxychains.nix

View file

@ -0,0 +1,19 @@
{ config, lib, pkgs, ... }:
with lib;
{
meta = {
maintainers = teams.pantheon.members;
};
###### interface
options = {
programs.pantheon-tweaks.enable = mkEnableOption "Pantheon Tweaks, an unofficial system settings panel for Pantheon";
};
###### implementation
config = mkIf config.programs.pantheon-tweaks.enable {
services.xserver.desktopManager.pantheon.extraSwitchboardPlugs = [ pkgs.pantheon-tweaks ];
};
}

View file

@ -0,0 +1,68 @@
{ lib
, stdenv
, fetchFromGitHub
, nix-update-script
, meson
, ninja
, pkg-config
, python3
, vala
, gtk3
, libgee
, pantheon
}:
stdenv.mkDerivation rec {
pname = "pantheon-tweaks";
version = "1.0.1";
src = fetchFromGitHub {
owner = "pantheon-tweaks";
repo = pname;
rev = version;
sha256 = "sha256-tAfDxX/RD7pO5PN/LaZ92Cj/iZtBI/EHb0+pORfYnPM=";
};
patches = [
./fix-paths.patch
];
nativeBuildInputs = [
meson
ninja
pkg-config
python3
vala
];
buildInputs = [
gtk3
libgee
pantheon.granite
pantheon.switchboard
];
postPatch = ''
chmod +x meson/post_install.py
patchShebangs meson/post_install.py
'';
passthru = {
updateScript = nix-update-script {
attrPath = pname;
};
};
meta = with lib; {
description = "Unofficial system settings panel for Pantheon";
longDescription = ''
Unofficial system settings panel for Pantheon
that lets you easily and safely customise your desktop's appearance.
Use programs.pantheon-tweaks.enable to add this to your switchboard.
'';
homepage = "https://github.com/pantheon-tweaks/pantheon-tweaks";
license = licenses.gpl3Plus;
platforms = platforms.linux;
maintainers = teams.pantheon.members;
};
}

View file

@ -0,0 +1,13 @@
diff --git a/src/Settings/ThemeSettings.vala b/src/Settings/ThemeSettings.vala
index 589121b..8e9c81e 100644
--- a/src/Settings/ThemeSettings.vala
+++ b/src/Settings/ThemeSettings.vala
@@ -29,7 +29,7 @@ public class PantheonTweaks.ThemeSettings {
var themes = new Gee.ArrayList<string> ();
string[] dirs = {
- "/usr/share/" + path + "/",
+ "/run/current-system/sw/share/" + path + "/",
Environment.get_home_dir () + "/." + path + "/",
Environment.get_home_dir () + "/.local/share/" + path + "/"};

View file

@ -8023,6 +8023,8 @@ with pkgs;
pamtester = callPackage ../tools/security/pamtester { };
pantheon-tweaks = callPackage ../applications/system/pantheon-tweaks { };
paperless-ng = callPackage ../applications/office/paperless-ng { };
paperwork = callPackage ../applications/office/paperwork/paperwork-gtk.nix { };