Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
base: 0f25eb3e7dc1
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: d6dba0d7c159
Choose a head ref
  • 6 commits
  • 4 files changed
  • 2 contributors

Commits on Dec 13, 2020

  1. xinit: use the system xserverrc 

    Previously it'd try to use the one under its output path which is read-only of
course
    @Atemu
    Atemu committed Dec 13, 2020
    Copy the full SHA
    338939d View commit details
    Browse the repository at this point in the history

  2. nixos/startx: provide xserverArgs via xserverrc 

    Fixes #80198
    @Atemu
    Atemu committed Dec 13, 2020
    Copy the full SHA
    c72c02a View commit details
    Browse the repository at this point in the history

  3. xorgserver: set log-dir to /var/log instead of the Nix store 

    Xorg creates the log-dir in its output path because X crashes if it can't write
to its logfile. On a regular distro, this dir would be installed into the root
to prevent that from happening but with Nix, it sits in the read-only Nix store.
Ironically, when Xorg tries to write here, it fails and crashes.

To make Xorg log to /var/log, we have to stop the build script from trying to
create the log-dir as the sandbox doesn't (and shouldn't) have access to /var.

This creates a runtime dependency on /var when running as root but that should
exist on any Linux system (on NixOS, journald always creates /var/log).

Previously, the startx displayManager required some workarounds for logfiles
which are obsolete now.

patchPhase -> postPatch because overriding the patchPhase prevents patches from
being applied
    @Atemu
    Atemu committed Dec 13, 2020
    Copy the full SHA
    a5ea1b6 View commit details
    Browse the repository at this point in the history

  4. nixos/xserver: make logFile configurable 

    It makes sense for it to be /dev/null for all the displayManagers but startx,
it needs a different logFile configuration.
    @Atemu
    Atemu committed Dec 13, 2020
    Copy the full SHA
    693a31a View commit details
    Browse the repository at this point in the history

  5. nixos/startx: send Xorg log to the default location 

    This partially reverts bf3d3dd.

I don't know why we weren't getting a default logfile back then but Xorg
definitely provides one now ($XDG_DATA_HOME for regular users and /var/log for
root, see `man Xorg`)
    @Atemu
    Atemu committed Dec 13, 2020
    Copy the full SHA
    d3113a6 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #100774 from Atemu/startx-improvements 

    Startx improvements
    @timokau
    timokau committed Dec 13, 2020
    Copy the full SHA
    d6dba0d View commit details
    Browse the repository at this point in the history