Revert "Refactor mkFlag / shouldUsePkg into the nixpkgs libraries"

This reverts commit 25a148fa19.
This commit is contained in:
Eelco Dolstra
2015-06-04 14:54:48 +02:00
parent 4f60156afb
commit 3096d03435
18 changed files with 176 additions and 104 deletions
+2 -1
View File
@@ -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;
+2 -1
View File
@@ -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;