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: 5b286eaf20e0
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: c8ae3d870cf5
Choose a head ref
  • 3 commits
  • 1 file changed
  • 1 contributor

Commits on Nov 25, 2020

  1. setup.sh: Support XDG_DATA_DIRS 

    XDG_DATA_DIRS is to /share as PATH is to /bin.

It was defined as part of the XDG basedir specification.
https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html

While it originated from the X Desktop Group, it is not limited to
the X11 ecosystem, as evidenced by its use in bash-completion.

The removal of ` && -d "$pkg/bin"` is ok, because this optimization is
already performed by `addToSearchPath`.
    @roberth
    roberth authored and Jonathan Ringer committed Nov 25, 2020
    Copy the full SHA
    0f13ccc View commit details
    Browse the repository at this point in the history

  2. setup.sh: Only load XDG_DATA_DIRS for executable inputs 

    This avoids the scenario where strictDeps is off and cross-compiled
XDG_DATA_DIRS content is brought into the environment.

While probably harmless for data like manpages and completion scripts,
this would cause issues when XDG_DATA_DIRS is used to find executables
or plugins. The Qt framework is known to behave like this and might
have run into incompatibilities.
    @roberth
    roberth authored and Jonathan Ringer committed Nov 25, 2020
    Copy the full SHA
    84c58ab View commit details
    Browse the repository at this point in the history

  3. setup.sh: export XDG_DATA_DIRS for consistency 

    By exporting it, we always make the new directories available
to subprocesses, regardless of whether the environment
variable existed before `nix-shell` was invoked.
    @roberth
    roberth authored and Jonathan Ringer committed Nov 25, 2020
    Copy the full SHA
    c8ae3d8 View commit details
    Browse the repository at this point in the history