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

Commits on Sep 11, 2020

  1. jackmix, jackmix_jack1: fix build, add alsaLib dependency

    @freezeboy
    freezeboy committed Sep 11, 2020
    Copy the full SHA
    6dafaa5 View commit details

  2. Merge pull request #97753 from freezeboy/fix-jackmix 

    jackmix, jackmix_jack1: fix build, add alsaLib dependency
    @risicle
    risicle authored Sep 11, 2020
    Copy the full SHA
    8029886 View commit details
Showing with 2 additions and 1 deletion.
  1. +2 −1 pkgs/applications/audio/jackmix/default.nix
3 changes: 2 additions & 1 deletion pkgs/applications/audio/jackmix/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, sconsPackages, qt4, lash, libjack2, jack ? libjack2 }:
{ stdenv, fetchurl, pkgconfig, sconsPackages, qt4, lash, libjack2, jack ? libjack2, alsaLib }:

stdenv.mkDerivation {
name = "jackmix-0.5.2";
@@ -14,6 +14,7 @@ stdenv.mkDerivation {
qt4
lash
jack
alsaLib
];

installPhase = ''