Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Session rewrite: Generate pantheon.session and autostarts #28

Merged
merged 3 commits into from Jun 11, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
18 changes: 15 additions & 3 deletions .github/workflows/main.yml
Expand Up @@ -6,18 +6,30 @@ jobs:
build:

runs-on: ubuntu-latest

container:
image: elementary/docker:unstable

steps:
- uses: actions/checkout@v1
- name: Install Dependencies
run: |
apt update
apt install -y meson
apt install -y meson pkg-config gnome-settings-daemon gnome-settings-daemon-dev onboard gnome-keyring orca
- name: Build
run: |
meson build
ninja -C build
ninja -C build install

build-nix:

runs-on: ubuntu-latest

steps:
- name: Checkout
uses: actions/checkout@v2
- name: Nix
uses: cachix/install-nix-action@v8
- name: Build
run: 'nix-build --quiet -I nixpkgs=channel:20.03'

This file was deleted.

This file was deleted.

9 changes: 0 additions & 9 deletions autostart/gsd/org.gnome.SettingsDaemon.Color-pantheon.desktop

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

9 changes: 0 additions & 9 deletions autostart/gsd/org.gnome.SettingsDaemon.Mouse-pantheon.desktop

This file was deleted.

9 changes: 0 additions & 9 deletions autostart/gsd/org.gnome.SettingsDaemon.Power-pantheon.desktop

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

9 changes: 0 additions & 9 deletions autostart/gsd/org.gnome.SettingsDaemon.Sound-pantheon.desktop

This file was deleted.

9 changes: 0 additions & 9 deletions autostart/gsd/org.gnome.SettingsDaemon.Wacom-pantheon.desktop

This file was deleted.

This file was deleted.

18 changes: 0 additions & 18 deletions autostart/meson.build

This file was deleted.

15 changes: 0 additions & 15 deletions autostart/ubuntu/gnome-keyring-gpg-pantheon.desktop

This file was deleted.

15 changes: 0 additions & 15 deletions autostart/ubuntu/gnome-keyring-pkcs11-pantheon.desktop

This file was deleted.

15 changes: 0 additions & 15 deletions autostart/ubuntu/gnome-keyring-secrets-pantheon.desktop

This file was deleted.

15 changes: 0 additions & 15 deletions autostart/ubuntu/gnome-keyring-ssh-pantheon.desktop

This file was deleted.

9 changes: 0 additions & 9 deletions autostart/ubuntu/onboard-autostart-pantheon.desktop

This file was deleted.

10 changes: 0 additions & 10 deletions autostart/ubuntu/orca-autostart-pantheon.desktop

This file was deleted.

12 changes: 0 additions & 12 deletions autostart/ubuntu/user-dirs-update-gtk-pantheon.desktop

This file was deleted.

39 changes: 39 additions & 0 deletions default.nix
@@ -0,0 +1,39 @@
{ pkgs ? import <nixpkgs> { config = {}; overlays = []; }
}:

with pkgs;

stdenv.mkDerivation rec {
name = "elementary-session-settings";

src = stdenv.lib.cleanSource ./.;

nativeBuildInputs = [
desktop-file-utils
meson
ninja
pkg-config
];

buildInputs = [
pantheon.elementary-settings-daemon
gnome3.gnome-keyring
onboard
orca
];

mesonFlags = [
"-Dmimeapps-list=false"
"-Dfallback-session=GNOME"
"-Ddetect-program-prefixes=true"
"--sysconfdir=${placeholder "out"}/etc"
];

meta = with stdenv.lib; {
description = "Session settings for elementary";
homepage = https://github.com/elementary/session-settings;
license = licenses.lgpl3;
platforms = platforms.linux;
maintainers = pantheon.maintainers;
};
}
11 changes: 0 additions & 11 deletions gnome-session/meson.build

This file was deleted.

5 changes: 0 additions & 5 deletions gnome-session/pantheon.session.in

This file was deleted.

3 changes: 1 addition & 2 deletions meson.build
Expand Up @@ -9,6 +9,5 @@ if get_option('mimeapps-list')
subdir('applications')
endif

subdir('autostart')
subdir('gnome-session')
subdir('session')
subdir('xsessions')
9 changes: 3 additions & 6 deletions meson_options.txt
@@ -1,11 +1,8 @@
option('mimeapps-list', type : 'boolean', value: true,
description : 'Install Pantheon default mimetype associations')

option('patched-gsd-autostarts', type : 'boolean', value: true,
description : 'Install patched GNOME Settings Daemon autostarts')

option('patched-ubuntu-autostarts', type : 'boolean', value: true,
description : 'Install patched Ubuntu autostarts')

option('fallback-session', type : 'string', value: 'ubuntu',
description : 'Fallback session to use for Pantheon')

option('detect-program-prefixes', type: 'boolean', value: false,
description : 'This is needed for platforms that install packages into individual prefixes (like Guix System or NixOS')