colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #170360 from bobby285271/pantheon

Browse Source 
Pantheon 7 updates 2022-04-25
This commit is contained in:
Bobby Rong 2022-04-28 12:44:12 +08:00 committed by GitHub
commit f4f969a484
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nixos/modules/services/x11/desktop-managers/pantheon.xml
View File

@ -3,7 +3,7 @@
xml:id="chap-pantheon">
<title>Pantheon Desktop</title>
<para>
Pantheon is the desktop environment created for the elementary OS distribution. It is written from scratch in Vala, utilizing GNOME technologies with GTK 3 and Granite.
Pantheon is the desktop environment created for the elementary OS distribution. It is written from scratch in Vala, utilizing GNOME technologies with GTK and Granite.
</para>
<section xml:id="sec-pantheon-enable">
<title>Enabling Pantheon</title>
@ -89,9 +89,9 @@ switchboard-with-plugs.override {
</para>
</listitem>
</varlistentry>
<varlistentry xml:id="sec-pantheon-faq-gnome3-and-pantheon">
<varlistentry xml:id="sec-pantheon-faq-gnome-and-pantheon">
<term>
I cannot enable both GNOME 3 and Pantheon.
I cannot enable both GNOME and Pantheon.
</term>
<listitem>
<para>

17
pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix
View File

@ -1,31 +1,38 @@
{ lib
, stdenv
, stdenvNoCC
, fetchFromGitHub
, nix-update-script
, gettext
, meson
, ninja
, gettext
, python3
, sassc
}:
stdenv.mkDerivation rec {
stdenvNoCC.mkDerivation rec {
pname = "elementary-gtk-theme";
version = "6.1.1";
version = "7.0.0";
src = fetchFromGitHub {
owner = "elementary";
repo = "stylesheet";
rev = version;
sha256 = "sha256-gciBn5MQ5Cu+dROL5kCt2GCbNA7W4HOWXyjMBd4OP+8=";
sha256 = "sha256-ZnQ54ktH0/ZyFH6c180YzbkK/TyIDziiwAXi/zqHpe4=";
};
nativeBuildInputs = [
gettext
meson
ninja
python3
sassc
];
postPatch = ''
chmod +x meson/install-to-dir.py
patchShebangs meson/install-to-dir.py
'';
passthru = {
updateScript = nix-update-script {
attrPath = "pantheon.${pname}";

12
pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix
View File

@ -1,5 +1,5 @@
{ lib
, stdenv
, stdenvNoCC
, fetchFromGitHub
, nix-update-script
, meson
@ -7,19 +7,19 @@
, ninja
, hicolor-icon-theme
, gtk3
, xorg
, xcursorgen
, librsvg
}:
stdenv.mkDerivation rec {
stdenvNoCC.mkDerivation rec {
pname = "elementary-icon-theme";
version = "6.1.0";
version = "7.0.0";
src = fetchFromGitHub {
owner = "elementary";
repo = "icons";
rev = version;
sha256 = "sha256-WR4HV0nJKj0WeSFHXLK64O0LhX8myAJE4w0aztyhPn4=";
sha256 = "sha256-tyhKhZPoZ8xVy1KVUWd8BK2meTT3Z6qM787spjE+NL8=";
};
nativeBuildInputs = [
@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
meson
ninja
python3
xorg.xcursorgen
xcursorgen
];
propagatedBuildInputs = [