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: c958c1b6b2f9
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 5bfb673137d9
Choose a head ref
  • 3 commits
  • 4 files changed
  • 1 contributor

Commits on Dec 27, 2020

  1. ell: fix cross compilation 

    The current `fix-dbus-tests.patch` uses automake and pkgconfig to figure
out the path of `dbus-daemon`. This fails when cross-compiling, as
tests aren't run (and `checkInputs`) not available.

Instead of doing this, we can simply teach the tests to pick up
dbus-daemon from $PATH. This was also sent upstream in
https://lists.01.org/hyperkitty/list/ell@lists.01.org/thread/SQEZAIS2LZXSXGTXOW3GTAM5ZPXRLTN4/.
    @flokli
    flokli committed Dec 27, 2020
    Copy the full SHA
    52261c4 View commit details
    Browse the repository at this point in the history

  2. iwd: fix cross compilation 

    This derivation uses wrapPython to wrap some "test scripts" that are
shipped in the "test" output.

As these test scripts require gobject-introspection, which doesn't
cross-compile at all, let's only patch and ship them when not
cross-compiling.
    @flokli
    flokli committed Dec 27, 2020
    Copy the full SHA
    d24918b View commit details
    Browse the repository at this point in the history

  3. Merge pull request #107712 from flokli/iwd-fix-cross 

    Iwd: fix cross compilation
    @flokli
    flokli committed Dec 27, 2020
    Copy the full SHA
    5bfb673 View commit details
    Browse the repository at this point in the history