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: 53b3b1b6986e
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: dd22335c3b4d
Choose a head ref
  • 3 commits
  • 3 files changed
  • 2 contributors

Commits on May 10, 2017

  1. openmpt123: don't build pulseaudio driver

    gnidorah committed May 10, 2017
    Copy the full SHA
    a3539a0 View commit details

Commits on May 12, 2017

  1. libao: build both pulse and alsa drivers

    gnidorah committed May 12, 2017
    Copy the full SHA
    7da0b96 View commit details

Commits on May 24, 2017

  1. Merge pull request #25680 from gnidorah/master2 

    openmpt123: don't build pulseaudio driver, libao: build both pulse and alsa drivers
    @fpletz
    fpletz authored May 24, 2017
    Copy the full SHA
    dd22335 View commit details
Showing with 4 additions and 3 deletions.
  1. +1 −1 pkgs/applications/audio/openmpt123/default.nix
  2. +2 −1 pkgs/development/libraries/libao/default.nix
  3. +1 −1 pkgs/top-level/all-packages.nix
2 changes: 1 addition & 1 deletion pkgs/applications/audio/openmpt123/default.nix
View file
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@ in stdenv.mkDerivation rec {
sha256 = "0qp2nnz6pnl1d7yv9hcjyim7q6yax5881k1jxm8jfgjqagmz5k6p";
};
buildInputs = [ SDL2 pkgconfig flac libsndfile ];
makeFlags = [ "NO_LTDL=1 TEST=0 EXAMPLES=0" ]
makeFlags = [ "NO_PULSEAUDIO=1 NO_LTDL=1 TEST=0 EXAMPLES=0" ]
++ stdenv.lib.optional (stdenv.isDarwin) "SHARED_SONAME=0";
installFlags = "PREFIX=\${out}";

3 changes: 2 additions & 1 deletion pkgs/development/libraries/libao/default.nix
View file
Original file line number Diff line number Diff line change
@@ -14,7 +14,8 @@ stdenv.mkDerivation rec {

buildInputs =
[ pkgconfig ] ++
lib.optional stdenv.isLinux (if usePulseAudio then libpulseaudio else alsaLib) ++
lib.optional usePulseAudio libpulseaudio ++
lib.optional stdenv.isLinux alsaLib ++
lib.optional stdenv.isLinux libcap ++
lib.optionals stdenv.isDarwin [ CoreAudio CoreServices AudioUnit ];

2 changes: 1 addition & 1 deletion pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -8271,7 +8271,7 @@ with pkgs;
libagar_test = callPackage ../development/libraries/libagar/libagar_test.nix { };

libao = callPackage ../development/libraries/libao {
usePulseAudio = config.pulseaudio or true;
usePulseAudio = config.pulseaudio or stdenv.isLinux;
inherit (darwin.apple_sdk.frameworks) CoreAudio CoreServices AudioUnit;
};