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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 22f1c746dfbd
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 6221782074b0
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Jan 1, 2021

  1. polkit: don't build with gobject-introspection when cross-compiling 

    gobject-introspection doesn't currently cross-compile (see
#88222), but polkit is somewhat
essential for many system components.

By disabling gobject-introspection when cross-compiling, we get it to
build.
    @flokli
    flokli committed Jan 1, 2021

    Verified

    This commit was signed with the committer’s verified signature.
    primeos Michael Weiss
    GPG key ID: 5BE487C4D4771D83
    Verified
    Learn about vigilant mode
    Copy the full SHA
    4f087a6 View commit details

Commits on Jan 2, 2021

  1. Merge pull request #108173 from flokli/cross-compile-nixos-sd 

    Fix NixOS cross-compilation SD Image
    @flokli
    flokli authored Jan 2, 2021

    Verified

    This commit was signed with the committer’s verified signature.
    primeos Michael Weiss
    GPG key ID: 5BE487C4D4771D83
    Verified
    Learn about vigilant mode
    Copy the full SHA
    6221782 View commit details
Showing with 2 additions and 1 deletion.
  1. +2 −1 pkgs/development/libraries/polkit/default.nix
3 changes: 2 additions & 1 deletion pkgs/development/libraries/polkit/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,7 +2,8 @@
, intltool, spidermonkey_78, gobject-introspection, libxslt, docbook_xsl, dbus
, docbook_xml_dtd_412, gtk-doc, coreutils
, useSystemd ? (stdenv.isLinux && !stdenv.hostPlatform.isMusl), systemd, elogind
, withIntrospection ? true
# needed until gobject-introspection does cross-compile (https://github.com/NixOS/nixpkgs/pull/88222)
, withIntrospection ? (stdenv.buildPlatform == stdenv.hostPlatform)
# A few tests currently fail on musl (polkitunixusertest, polkitunixgrouptest, polkitidentitytest segfault).
# Not yet investigated; it may be due to the "Make netgroup support optional"
# patch not updating the tests correctly yet, or doing something wrong,