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

Commits on Sep 1, 2020

  1. Copy the full SHA
    5d29fd1 View commit details

Commits on Sep 5, 2020

  1. Merge pull request #96915 from juliendehos/lingot

    lingot: add jackSupport option
    risicle authored Sep 5, 2020
    Copy the full SHA
    a10cd24 View commit details
Showing with 4 additions and 4 deletions.
  1. +4 −4 pkgs/applications/audio/lingot/default.nix
8 changes: 4 additions & 4 deletions pkgs/applications/audio/lingot/default.nix
Original file line number Diff line number Diff line change
@@ -5,8 +5,10 @@
, gtk3
, wrapGAppsHook
, alsaLib
, libjack2
, libpulseaudio
, fftw
, jackSupport ? true
}:

stdenv.mkDerivation rec {
@@ -29,11 +31,9 @@ stdenv.mkDerivation rec {
alsaLib
libpulseaudio
fftw
];
] ++ stdenv.lib.optional jackSupport libjack2;

configureFlags = [
"--disable-jack"
];
configureFlags = stdenv.lib.optional (!jackSupport) "--disable-jack";

meta = {
description = "Not a Guitar-Only tuner";