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

Commits on Apr 20, 2019

  1. libredirect: add support for openat and dlopen

    gobject-introspection uses glib’s g_module_open function, which in turn relies
    on dlopen. I also implemented openat, since I initially thought this function
    was used but turns out dlopen uses the openat signal directly. We might as
    well keep it, even thought I do not need it at the moment.
    jtojnar committed Apr 20, 2019
    Copy the full SHA
    90f3a23 View commit details
    Browse the repository at this point in the history

Commits on Apr 22, 2019

  1. networkmanager: port to Meson

    All hail Meson!
    
    One serious issue is that building docs does not work.
    
    We patch gobject-introspection to use absolute paths for shared libraries
    in GIR files. Building the NetworkManager docs relies on the produced
    introspection data but since the library is not yet installed
    at the time the docs are generated, the build will fail.
    
    It works in Autotools for some reason; they probably use
    the pregenerated GIRs from the tarball.
    
    Disabling the docs completely is not possible at the moment either,
    since nmc [depends on them][1].
    
    I have decided to fix this by pointing the installed location to the one
    in the build directory using libredirect. Unfortunately, we cannot just set
    the environment variables directly, since the build system runs
    the documentation generator in a clean environment.
    
    I have also added man, doc and devdoc outputs so the generated files have
    somewhere to go.
    
    Secondly, since Nix store is immutable, we also cannot use the package prefix
    for configuration and mutable state data. At the same time, we cannot write
    to the appropriate global directories during build. Autotools allowed to change
    this in installFlags but Meson lacks similar mechanism so we need to patch
    the build files.
    
    Finally, I also removed the at_console patch since the permission has been
    removed in 0.9.10.
    
    [1]: https://bugzilla.gnome.org/show_bug.cgi?id=796755
    jtojnar committed Apr 22, 2019
    1
    Copy the full SHA
    a961a28 View commit details
    Browse the repository at this point in the history

Commits on Apr 23, 2019

  1. networkmanager: port to Meson (#59916)

    networkmanager: port to Meson
    jtojnar committed Apr 23, 2019
    Copy the full SHA
    60b3828 View commit details
    Browse the repository at this point in the history