diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-06-01 20:52:03 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-06-04 14:54:48 +0200 |
| commit | 3096d03435bb177af8c4868a8efa637b393f2715 (patch) | |
| tree | b5353e40eb18bba0e86b04a176879f3e635f48e7 /pkgs/misc | |
| parent | 4f60156afbb8d61d8d28db8ab594ec9328946d71 (diff) | |
| download | nixlib-3096d03435bb177af8c4868a8efa637b393f2715.tar nixlib-3096d03435bb177af8c4868a8efa637b393f2715.tar.gz nixlib-3096d03435bb177af8c4868a8efa637b393f2715.tar.bz2 nixlib-3096d03435bb177af8c4868a8efa637b393f2715.tar.lz nixlib-3096d03435bb177af8c4868a8efa637b393f2715.tar.xz nixlib-3096d03435bb177af8c4868a8efa637b393f2715.tar.zst nixlib-3096d03435bb177af8c4868a8efa637b393f2715.zip | |
Revert "Refactor mkFlag / shouldUsePkg into the nixpkgs libraries"
This reverts commit 25a148fa196b944b3f134527da87e43d88c066f9.
Diffstat (limited to 'pkgs/misc')
| -rw-r--r-- | pkgs/misc/jackaudio/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/misc/jackaudio/jack1.nix | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/misc/jackaudio/default.nix b/pkgs/misc/jackaudio/default.nix index adddd3ac2116..47511cf58b0e 100644 --- a/pkgs/misc/jackaudio/default.nix +++ b/pkgs/misc/jackaudio/default.nix @@ -9,9 +9,10 @@ , prefix ? "" }: -with stdenv; with stdenv.lib; let + shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (x: x == stdenv.system) pkg.meta.platforms then pkg else null; + libOnly = prefix == "lib"; optDbus = shouldUsePkg dbus; diff --git a/pkgs/misc/jackaudio/jack1.nix b/pkgs/misc/jackaudio/jack1.nix index 343c3af9cee7..1c5c78548f5b 100644 --- a/pkgs/misc/jackaudio/jack1.nix +++ b/pkgs/misc/jackaudio/jack1.nix @@ -4,8 +4,9 @@ , alsaLib ? null, db ? null, libuuid ? null, libffado ? null, celt ? null }: -with stdenv; let + shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (x: x == stdenv.system) pkg.meta.platforms then pkg else null; + optAlsaLib = shouldUsePkg alsaLib; optDb = shouldUsePkg db; optLibuuid = shouldUsePkg libuuid; |