mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-10-06 04:27:27 +03:00
pantheon-tweaks: 1.1.2 -> 2.0.1
Also move to by-name. https://github.com/pantheon-tweaks/pantheon-tweaks/compare/1.1.2...2.0.1
This commit is contained in:
parent
6c0b7a92c3
commit
4f5bd47b56
@ -7,6 +7,7 @@
|
||||
, pkg-config
|
||||
, python3
|
||||
, vala
|
||||
, wrapGAppsHook3
|
||||
, gtk3
|
||||
, libgee
|
||||
, pantheon
|
||||
@ -14,25 +15,22 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pantheon-tweaks";
|
||||
version = "1.1.2";
|
||||
version = "2.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pantheon-tweaks";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-E9YSRfh9bLAHn2y4p3aKwR5NOtexKokLWj3RwtDnLsQ=";
|
||||
hash = "sha256-P3eM+xgsAMvqr2mIEjkQSjhxvQAwtSNItxAUcjO3ciY=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./fix-paths.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
python3
|
||||
vala
|
||||
wrapGAppsHook3
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
@ -42,12 +40,14 @@ stdenv.mkDerivation rec {
|
||||
elementary-files # settings schemas
|
||||
elementary-terminal # settings schemas
|
||||
granite
|
||||
switchboard
|
||||
]);
|
||||
|
||||
postPatch = ''
|
||||
chmod +x meson/post_install.py
|
||||
patchShebangs meson/post_install.py
|
||||
|
||||
substituteInPlace src/Settings/ThemeSettings.vala \
|
||||
--replace-fail "/usr/share/" "/run/current-system/sw/share/"
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
@ -55,15 +55,15 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Unofficial system settings panel for Pantheon";
|
||||
description = "Unofficial system customization app for Pantheon";
|
||||
longDescription = ''
|
||||
Unofficial system settings panel for Pantheon
|
||||
Unofficial system customization app 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;
|
||||
mainProgram = "pantheon-tweaks";
|
||||
};
|
||||
}
|
@ -221,10 +221,8 @@ lib.makeScope pkgs.newScope (self: with self; {
|
||||
|
||||
### THIRD-PARTY
|
||||
|
||||
# Put packages that ONLY works with Pantheon in pkgs/desktops/pantheon/third-party,
|
||||
# specifically third party switchboard plugins and wingpanel indicators.
|
||||
# Please call these packages in pkgs/top-level/all-packages.nix instead of this file.
|
||||
# https://github.com/NixOS/nixpkgs/issues/115222#issuecomment-906868654
|
||||
# As suggested in https://github.com/NixOS/nixpkgs/issues/115222#issuecomment-906868654
|
||||
# please avoid putting third-party packages in the `pantheon` scope.
|
||||
|
||||
}) // lib.optionalAttrs config.allowAliases {
|
||||
|
||||
|
@ -1,13 +0,0 @@
|
||||
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 + "/"};
|
||||
|
@ -37698,8 +37698,6 @@ with pkgs;
|
||||
|
||||
pantheon = recurseIntoAttrs (callPackage ../desktops/pantheon { });
|
||||
|
||||
pantheon-tweaks = callPackage ../desktops/pantheon/third-party/pantheon-tweaks { };
|
||||
|
||||
wingpanel-indicator-ayatana = callPackage ../desktops/pantheon/third-party/wingpanel-indicator-ayatana { };
|
||||
|
||||
rox-filer = callPackage ../desktops/rox/rox-filer {
|
||||
|
Loading…
Reference in New Issue
Block a user