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: c0a936168737
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 040d7580a56c
Choose a head ref
  • 3 commits
  • 2 files changed
  • 2 contributors

Commits on Jan 1, 2021

  1. alsa-plugins: don't build with libjack2 support when cross-compiling

    libjack2 doesn't cross-compile, see
    #96548.
    
    The pulseaudio NixOS module uses pkgs.alsaPlugins to create its
    asound.conf, so let's make sure that one can be built when
    cross-compiling.
    flokli committed Jan 1, 2021
    Copy the full SHA
    033cfcc View commit details
    Browse the repository at this point in the history
  2. pulseaudio: fix cross compilation by disabling gsettings when cross-c…

    …ompiling
    
    When cross-compiling, pulseaudio seems to not find some m4 macro
    providing GSETTINGS_RULES.
    
    However, apart from the obviously missing gsettings support, this works
    just fine.
    flokli committed Jan 1, 2021
    Copy the full SHA
    767252d View commit details
    Browse the repository at this point in the history
  3. Merge pull request #108174 from flokli/cross-compile-pulseaudio

    pulseaudio: fix cross-compilation
    Ericson2314 committed Jan 1, 2021
    Copy the full SHA
    040d758 View commit details
    Browse the repository at this point in the history