leyoda/libcosmic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

improv(cosmic-config): remove hardcoded paths

Browse source 
This commit changes the hardcoded /usr/share paths in cosmic-config to
become performed via XDG lookups using the `xdg` crate.

This allows the installed files to be discovered on non-FHS Linux, e.g.
NixOS.

Hardcoded /var/lib/ is removed entirely because
1. nothing installs to it yet (only user of new_state is cosmic_bg
   currently and it does not install to /var/lib)
2. it's intended for system states, not template for user state.
3. it's not part of XDG spec.

On Windows the known folder crate is used.

Signed-off-by: Gary Guo <gary@garyguo.net>
This commit is contained in:
Gary Guo 2023-12-26 22:09:53 +00:00 • committed by Michael Murphy
parent 912e8b0a44
commit 3aef16bf9e
2 changed files with 59 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

7
cosmic-config/Cargo.toml
View file

@ -10,7 +10,6 @@ macro = ["cosmic-config-derive"]
subscription = ["iced_futures"]
[dependencies]
# For redox support
zbus = { version = "3.14.1", default-features = false, optional = true }
atomicwrites = { git = "https://github.com/jackpot51/rust-atomicwrites" }
calloop = { version = "0.12.2", optional = true }
@ -24,3 +23,9 @@ iced_futures = { path = "../iced/futures/", default-features = false, optional =
once_cell = "1.19.0"
cosmic-settings-daemon = { git = "https://github.com/pop-os/dbus-settings-bindings", branch = "cosmic-settings-daemon", optional = true }
futures-util = { version = "0.3", optional = true }
[target.'cfg(unix)'.dependencies]
xdg = "2.1"
[target.'cfg(windows)'.dependencies]
known-folders = "1.1.0"