dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #332718 from bobby285271/upd/pantheon

Browse Source 
Pantheon updates 2024-08-06
This commit is contained in:
Bobby Rong 2024-08-07 21:00:23 +08:00 committed by GitHub
commit ea35e85725
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 36 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
pkgs/desktops/pantheon/apps/elementary-camera/default.nix
View File

@ -1,63 +1,55 @@
{ lib
, stdenv
, fetchFromGitHub
, nix-update-script
, meson
, ninja
, pkg-config
, python3
, vala
, wrapGAppsHook3
, glib
, granite
, gst_all_1
, gtk3
, libcanberra
, libgee
, libhandy
{
stdenv,
lib,
fetchFromGitHub,
meson,
ninja,
pkg-config,
vala,
wrapGAppsHook4,
glib,
granite7,
gst_all_1,
gtk4,
libadwaita,
libcanberra,
libgee,
nix-update-script,
}:
stdenv.mkDerivation rec {
pname = "elementary-camera";
version = "6.2.2";
version = "8.0.0";
src = fetchFromGitHub {
owner = "elementary";
repo = "camera";
rev = version;
sha256 = "sha256-Sj89TBat2RY2Ms02M0P7gmE9tXYk1yrnPLzDwGyAFZA=";
sha256 = "sha256-c8wpo2oMkovZikzcWHfiUIUA/+L7iWEcUv6Cg/BMa+s=";
};
nativeBuildInputs = [
meson
ninja
pkg-config
python3
vala
wrapGAppsHook3
wrapGAppsHook4
];
buildInputs = [
glib
granite
gtk3
granite7
gst_all_1.gst-plugins-bad
gst_all_1.gst-plugins-base
(gst_all_1.gst-plugins-good.override { gtkSupport = true; })
gst_all_1.gst-plugins-rs # GTK 4 sink
gst_all_1.gst-plugins-ugly
gst_all_1.gstreamer
gtk4
libadwaita
libcanberra
libgee
libhandy
] ++ (with gst_all_1; [
gst-plugins-bad
gst-plugins-base
# gtkSupport needed for gtksink
# https://github.com/elementary/camera/issues/181
(gst-plugins-good.override { gtkSupport = true; })
gst-plugins-ugly
gstreamer
]);
postPatch = ''
chmod +x meson/post_install.py
patchShebangs meson/post_install.py
'';
];
passthru = {
updateScript = nix-update-script { };

6
pkgs/desktops/pantheon/apps/elementary-files/default.nix
View File

@ -12,6 +12,7 @@
, glib
, libgee
, libhandy
, libportal-gtk3
, granite
, pango
, bamf
@ -25,7 +26,7 @@
stdenv.mkDerivation rec {
pname = "elementary-files";
version = "6.5.3";
version = "7.0.0";
outputs = [ "out" "dev" ];
@ -33,7 +34,7 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = "files";
rev = version;
sha256 = "sha256-geJLHRo1Bd2oFT+UtirHj9FVSFTFMK/v/5h+NF9woFo=";
hash = "sha256-6pEHyrQjqgbpOUEM/zbpuF8GM7JotDYfCnumU3aXIaI=";
};
nativeBuildInputs = [
@ -55,6 +56,7 @@ stdenv.mkDerivation rec {
libgee
libgit2-glib
libhandy
libportal-gtk3
pango
sqlite
systemd

11
pkgs/desktops/pantheon/apps/elementary-tasks/default.nix
View File

@ -5,7 +5,6 @@
, meson
, ninja
, pkg-config
, python3
, vala
, wrapGAppsHook3
, clutter-gtk
@ -23,20 +22,19 @@
stdenv.mkDerivation rec {
pname = "elementary-tasks";
version = "6.3.2";
version = "6.3.3";
src = fetchFromGitHub {
owner = "elementary";
repo = "tasks";
rev = version;
sha256 = "sha256-6Vwx+NRVGDqZzN5IVk4cQxGjSkYwrrNhUVoB8TRo28U=";
hash = "sha256-xOMS4Zwfl7TLHvm8Zn6wQ4ZoMg+Yuci+cTpUVG+liss=";
};
nativeBuildInputs = [
meson
ninja
pkg-config
python3
vala
wrapGAppsHook3
];
@ -55,11 +53,6 @@ stdenv.mkDerivation rec {
libportal-gtk3
];
postPatch = ''
chmod +x meson/post_install.py
patchShebangs meson/post_install.py
'';
passthru = {
updateScript = nix-update-script { };
};