Commit Graph

17 Commits

Author SHA1 Message Date
Jan Tojnar
4c10797e5b
Merge pull request #268535 from jtojnar/destdir-hack-cleanups
gnome.gdm, upower: Simplify DESTDIR hack
2023-12-25 17:06:05 +01:00
Bobby Rong
a62dfdf779 gnome.gdm: 45.beta → 45.0.1
https://gitlab.gnome.org/GNOME/gdm/-/compare/45.beta...45.0.1

Crasher fix.

Changelog-reviewed-by: Bobby Rong <rjl931189261@126.com>
Changelog-reviewed-by: Jan Tojnar <jtojnar@gmail.com>
2023-11-21 08:42:08 +01:00
Bobby Rong
5a330335a7 gnome.gdm: 44.1 → 45.beta
https://gitlab.gnome.org/GNOME/gdm/-/compare/44.1...45.beta

"Set gnome-initial-setup dconf profile" is done in g-i-s instead.
jt: I do not think we use g-i-s anyway.

meson change look okay. Allow using libelogind.

Unreviewed: Multiseat enablement for Wayland (looks like this still need changes from g-s):
https://gitlab.gnome.org/GNOME/gdm/-/merge_requests/174

Changelog-reviewed-by: Bobby Rong <rjl931189261@126.com>
Changelog-reviewed-by: Jan Tojnar <jtojnar@gmail.com>
2023-11-21 08:41:58 +01:00
Jan Tojnar
ff61f2bb3f gnome.gdm: Simplify DESTDIR hack
Let’s point `DESTDIR` to a path under the build directory rather than under "$out".
This will prevent `installPhase` from creating `$out` or any other output directory,
allowing us to install the outputs just by moving them out of `$DESTDIR` directly into the store with `mv`.
Of course, that will also require moving the installing of `etc` after the outputs are installed.

Since `$out` does not currently contain `etc` subdirectory, we can also just move `$DESTDIR/etc` directly to `$out` rather than copying it.
And even if `$out/etc` existed, we could just merge it with `cp --recursive` instead of `rsync` so `rsync` is not actually necessary.

The code remains written defensively against files accidentally being misplaced while shuffling them around – parent directories of targets are used as `mv` destinations so that the move fails loudly if the directory already exists, rather than being moved inside as e.g. `$out/etc/etc`.

While at it let’s also improve practices a bit:
- Quote command arguments.
- Move `DESTDIR` definition into `env` block.
- Add vertical space and clearer comments.
- Handle non-standard Nix store paths.
2023-11-19 18:44:48 +01:00
linsui
0e6827ed9c nixos/gdm: switch to dconf settings 2023-08-15 19:20:39 +08:00
Bobby Rong
dfe7647746
gnome.gdm: 44.0 → 44.1
https://gitlab.gnome.org/GNOME/gdm/-/compare/44.0...44.1
2023-05-06 11:18:00 +08:00
Jan Tojnar
2a32c75d1d gnome.gdm: 44.rc → 44.0
https://gitlab.gnome.org/GNOME/gdm/-/compare/44.rc...44.0

Changelog-Reviewed-By: Jan Tojnar <jtojnar@gmail.com>
2023-04-06 01:36:39 +02:00
Jan Tojnar
cc6084e9e3 gnome.gdm: 43.0 → 44.rc
https://gitlab.gnome.org/GNOME/gdm/-/compare/43.0...44.rc

Changelog-Reviewed-By: Jan Tojnar <jtojnar@gmail.com>
2023-04-06 01:35:11 +02:00
Artturin
238a6053c4 stdenv: support opt-in __structuredAttrs
Co-authored-by: Robin Gloster <mail@glob.in>

stdenv: print message if structuredAttrs is enabled

stdenv: add _append

reduces the chance of a user doing it wrong

fix nix develop issue

output hooks don't work yet in nix develop though

making $outputs be the same on non-structuredAttrs and structuredAttrs
is too much trouble.

lets instead make a function that gets the output names

reading environment file '/nix/store/2x7m69a2sm2kh0r6v0q5s9z1dh41m4xf-xz-5.2.5-env-bin'
nix: src/nix/develop.cc:299: std::string Common::makeRcScript(nix::ref<nix::Store>, const BuildEnvironment&, const Path&): Assertion `outputs != buildEnvironment.vars.end()' failed.

use a function to get all output names instead of using $outputs

copy env functionality from https://github.com/NixOS/nixpkgs/pull/76732/commits
2022-12-08 06:13:19 +02:00
Jan Tojnar
0530435ac0 gnome.gdm: 42.0 → 43.0
https://gitlab.gnome.org/GNOME/gdm/-/compare/42.0...43.0

Changelog-Reviewed-By: Jan Tojnar <jtojnar@gmail.com>
2022-10-11 18:52:31 +02:00
Jan Tojnar
0d08ea5a3b gnome.gdm: enable debug info 2022-10-11 18:52:20 +02:00
Artturin
da9a9a4404 treewide: cross fixes 2022-09-07 21:20:54 +03:00
Jan Tojnar
cd1d12ca65 gnome.gdm: 41.3 → 42.0
https://gitlab.gnome.org/GNOME/gdm/-/compare/41.3...42.0
2022-03-25 15:02:49 +01:00
Jan Tojnar
1a11eb1eb3 gnome.gdm: 41.0 → 41.3
Remove nvidiaWayland NixOS option since it was severely out of date.

https://ftp.gnome.org/pub/GNOME/sources/gdm/41/gdm-41.3.news
2022-01-30 04:47:01 +01:00
Jan Tojnar
db039f82ce gnome.gdm: 40.1 → 41.0 2021-10-09 21:35:53 +02:00
R. RyanTM
4c842cc4d8 gnome.gdm: 40.0 -> 40.1 2021-07-25 08:24:38 +00:00
Jan Tojnar
468cb5980b gnome: rename from gnome3
Since GNOME version is now 40, it no longer makes sense to use the old attribute name.
2021-05-08 09:47:42 +02:00