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

pantheon.elementary-session-settings: 2019-11-12 -> 2020-06-11

Browse Source
This commit is contained in:
worldofpeace 2020-07-03 14:38:32 -04:00
parent be048e3b89
commit 0a392fa7c2
1 changed files with 18 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix
View File

@ -1,7 +1,8 @@
{ stdenv { stdenv
, fetchFromGitHub , fetchFromGitHub
, fetchpatch
, substituteAll , substituteAll
, desktop-file-utils
, pkg-config
, writeScript , writeScript
, pantheon , pantheon
, gnome-keyring , gnome-keyring
@ -16,7 +17,6 @@
, writeText , writeText
, meson , meson
, ninja , ninja
, pkg-config
}: }:
let let
@ -69,53 +69,43 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "elementary-session-settings"; pname = "elementary-session-settings-unstable";
version = "unstable-2019-11-12"; version = "2020-06-11";
repoName = "session-settings"; repoName = "session-settings";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "elementary"; owner = "elementary";
repo = repoName; repo = repoName;
rev = "f9d5afed16ce447cf6ae3c2d1c1db5eece84daca"; rev = "130c9ae221913032ed18bcf6d21e3dcdba3c4209";
sha256 = "0n1m41aapr58rb1ffvfkjq6c6w3f0ynjzzhja50s4di98p4m7y0q"; sha256 = "0bzg9vbq0ssnxgcb2vxpx6x9zv8ngkm9r3ki5q83m9al9919n0pr";
}; };
patches = [
# Map Pantheon required components by g-s-d versions
# https://github.com/elementary/session-settings/pull/23
(fetchpatch {
url = "https://github.com/elementary/session-settings/commit/39918f4ec64fa9ed5affa109d6a692b97ae4ff01.patch";
sha256 = "0v2kqcsibymnslnnw4v67yh098znsrhrcycgxkw8vymvwlinc502";
})
];
nativeBuildInputs = [ nativeBuildInputs = [
desktop-file-utils
meson meson
ninja ninja
pkg-config pkg-config
]; ];
buildInputs = [ buildInputs = [
elementary-settings-daemon pantheon.elementary-settings-daemon
gnome-keyring
onboard
orca
]; ];
mesonFlags = [ mesonFlags = [
"-Ddefaults-list=false" "-Dmimeapps-list=false"
"-Dpatched-gsd-autostarts=false"
"-Dpatched-ubuntu-autostarts=false"
"-Dfallback-session=GNOME" "-Dfallback-session=GNOME"
"-Ddetect-program-prefixes=true"
"--sysconfdir=${placeholder "out"}/etc"
]; ];
postInstall = '' postInstall = ''
mkdir -p $out/share/applications mkdir -p $out/share/applications
cp -av ${./pantheon-mimeapps.list} $out/share/applications/pantheon-mimeapps.list cp -av ${./pantheon-mimeapps.list} $out/share/applications/pantheon-mimeapps.list
mkdir -p $out/etc/xdg/autostart
for package in ${gnome-keyring} ${orca} ${onboard} ${at-spi2-core}; do
cp -av $package/etc/xdg/autostart/* $out/etc/xdg/autostart
done
cp "${dockitemAutostart}" $out/etc/xdg/autostart/default-elementary-dockitems.desktop cp "${dockitemAutostart}" $out/etc/xdg/autostart/default-elementary-dockitems.desktop
mkdir -p $out/libexec mkdir -p $out/libexec
@ -127,21 +117,16 @@ stdenv.mkDerivation rec {
substituteInPlace $out/share/xsessions/pantheon.desktop \ substituteInPlace $out/share/xsessions/pantheon.desktop \
--replace "gnome-session --session=pantheon" "$out/libexec/pantheon" \ --replace "gnome-session --session=pantheon" "$out/libexec/pantheon" \
--replace "wingpanel" "${wingpanel}/bin/wingpanel" --replace "wingpanel" "${wingpanel}/bin/wingpanel"
for f in $out/etc/xdg/autostart/*; do mv "$f" "''${f%.desktop}-pantheon.desktop"; done
for autostart in $(grep -rl "OnlyShowIn=GNOME;" $out/etc/xdg/autostart)
do
echo "Patching OnlyShowIn to Pantheon in: $autostart"
sed -i "s,OnlyShowIn=GNOME;,OnlyShowIn=Pantheon;," $autostart
done
''; '';
passthru = { passthru = {
updateScript = pantheon.updateScript { updateScript = pantheon.updateScript {
attrPath = "pantheon.${pname}"; attrPath = "pantheon.${pname}";
}; };
providedSessions = [ "pantheon" ];
providedSessions = [
"pantheon"
];
}; };
meta = with stdenv.lib; { meta = with stdenv.lib; {