diff options
| author | Arnold Krille <arnold@arnoldarts.de> | 2015-10-02 14:30:39 +0200 |
|---|---|---|
| committer | Arnold Krille <arnold@arnoldarts.de> | 2015-10-02 15:42:00 +0200 |
| commit | 3bce303e05f3310b19d9f47e9bb5c1ba484ee456 (patch) | |
| tree | dfcb28bad95bfbe2ce54d8984a191e555a0ec0ab /pkgs | |
| parent | 48f05f7b101e8505c895540c1afca9a3221e4519 (diff) | |
| download | nixlib-3bce303e05f3310b19d9f47e9bb5c1ba484ee456.tar nixlib-3bce303e05f3310b19d9f47e9bb5c1ba484ee456.tar.gz nixlib-3bce303e05f3310b19d9f47e9bb5c1ba484ee456.tar.bz2 nixlib-3bce303e05f3310b19d9f47e9bb5c1ba484ee456.tar.lz nixlib-3bce303e05f3310b19d9f47e9bb5c1ba484ee456.tar.xz nixlib-3bce303e05f3310b19d9f47e9bb5c1ba484ee456.tar.zst nixlib-3bce303e05f3310b19d9f47e9bb5c1ba484ee456.zip | |
jackmix: Build jackmix in two flavours
Flavours are: - *jackmix* using jack2 (default) - *jackmix_jack1* using jack1
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/audio/jackmix/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 1 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/applications/audio/jackmix/default.nix b/pkgs/applications/audio/jackmix/default.nix index 7d840198dc7c..8176a3404702 100644 --- a/pkgs/applications/audio/jackmix/default.nix +++ b/pkgs/applications/audio/jackmix/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgs }: +{ stdenv, fetchurl, pkgs, jack ? pkgs.libjack2 }: stdenv.mkDerivation rec { name = "jackmix-0.5.2"; @@ -11,9 +11,8 @@ stdenv.mkDerivation rec { pkgs.pkgconfig pkgs.scons pkgs.kde4.qt4 - pkgs.jack1 pkgs.lash - pkgs.libuuid # should be a propagatedBuildInput on jack1 + jack ]; buildPhase = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0dcec4870b18..9d77849bbb77 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11803,6 +11803,7 @@ let jackmeter = callPackage ../applications/audio/jackmeter { }; jackmix = callPackage ../applications/audio/jackmix { }; + jackmix_jack1 = jackmix.override { jack = jack1; }; jalv = callPackage ../applications/audio/jalv { }; |