BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

pantheon.elementary-greeter: 5.0.4 -> 6.0.0

Browse source
This commit is contained in:
Bobby Rong 2021-07-17 21:34:54 +08:00
parent 0b44eae0ab
commit f7103f8927
No known key found for this signature in database
GPG key ID: ED07364437C91161
1 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix
View file

@ -1,5 +1,6 @@
{ lib, stdenv { lib, stdenv
, fetchFromGitHub , fetchFromGitHub
, fetchpatch
, nix-update-script , nix-update-script
, linkFarm , linkFarm
, substituteAll , substituteAll
@ -13,11 +14,13 @@
, gtk3 , gtk3
, granite , granite
, libgee , libgee
, elementary-settings-daemon , libhandy
, gnome-settings-daemon
, mutter , mutter
, elementary-icon-theme , elementary-icon-theme
, wingpanel-with-indicators , wingpanel-with-indicators
, elementary-gtk-theme , elementary-gtk-theme
, elementary-settings-daemon
, nixos-artwork , nixos-artwork
, lightdm , lightdm
, gdk-pixbuf , gdk-pixbuf
@ -29,7 +32,7 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "elementary-greeter"; pname = "elementary-greeter";
version = "5.0.4"; version = "6.0.0";
repoName = "greeter"; repoName = "greeter";
@ -37,7 +40,7 @@ stdenv.mkDerivation rec {
owner = "elementary"; owner = "elementary";
repo = repoName; repo = repoName;
rev = version; rev = version;
sha256 = "sha256-Enn+ekALWbk7FVJJuea/rNiwEZDIyb3kyMcZNNraOv8="; sha256 = "1ny1003bbpdscc4kr2d94zc5vxm30y64dpj3fpd5zz2p2g0cq2h9";
}; };
passthru = { passthru = {
@ -66,10 +69,12 @@ stdenv.mkDerivation rec {
elementary-gtk-theme elementary-gtk-theme
elementary-icon-theme elementary-icon-theme
elementary-settings-daemon elementary-settings-daemon
gnome-settings-daemon
gdk-pixbuf gdk-pixbuf
granite granite
gtk3 gtk3
libgee libgee
libhandy
lightdm lightdm
mutter mutter
wingpanel-with-indicators wingpanel-with-indicators
@ -80,12 +85,16 @@ stdenv.mkDerivation rec {
"--sbindir=${placeholder "out"}/bin" "--sbindir=${placeholder "out"}/bin"
# baked into the program for discovery of the greeter configuration # baked into the program for discovery of the greeter configuration
"--sysconfdir=/etc" "--sysconfdir=/etc"
# We use the patched gnome-settings-daemon "-Dgsd-dir=${gnome-settings-daemon}/libexec/" # trailing slash is needed
"-Dubuntu-patched-gsd=true"
"-Dgsd-dir=${elementary-settings-daemon}/libexec/" # trailing slash is needed
]; ];
patches = [ patches = [
# Upstream code not respecting our localedir
# https://github.com/elementary/greeter/pull/545
(fetchpatch {
url = "https://github.com/elementary/greeter/commit/d1373a7db827bc753bfcd70d0c8f25460ea9f1de.patch";
sha256 = "0s8l7ycd2s307d3dh1p4vdk33dbzjzqwxs6msyb9w0ycfyxlwdvp";
})
./sysconfdir-install.patch ./sysconfdir-install.patch
# Needed until https://github.com/elementary/greeter/issues/360 is fixed # Needed until https://github.com/elementary/greeter/issues/360 is fixed
(substituteAll { (substituteAll {