diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2007-05-20 20:24:43 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2007-05-20 20:24:43 +0000 |
| commit | 14c0ae4055d4f60d57b8f3ae9b65746dc35afc0a (patch) | |
| tree | df12e9f4582a6c405eca32ed280a5470a5080537 /pkgs/top-level/all-packages.nix | |
| parent | 978a82c5f461c760d365c67afe228d4ae7b63d95 (diff) | |
| download | nixpkgs-14c0ae4055d4f60d57b8f3ae9b65746dc35afc0a.tar nixpkgs-14c0ae4055d4f60d57b8f3ae9b65746dc35afc0a.tar.gz nixpkgs-14c0ae4055d4f60d57b8f3ae9b65746dc35afc0a.tar.bz2 nixpkgs-14c0ae4055d4f60d57b8f3ae9b65746dc35afc0a.tar.lz nixpkgs-14c0ae4055d4f60d57b8f3ae9b65746dc35afc0a.tar.xz nixpkgs-14c0ae4055d4f60d57b8f3ae9b65746dc35afc0a.tar.zst nixpkgs-14c0ae4055d4f60d57b8f3ae9b65746dc35afc0a.zip | |
* Move the `optional' function to lib.
svn path=/nixpkgs/trunk/; revision=8720
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9e2fae64961..06969214e7d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -166,8 +166,6 @@ rec { meta = (if drv ? meta then drv.meta else {}) // {priority = "10";}; }; - optional = cond: elem: if cond then [elem] else []; - ### STANDARD ENVIRONMENT @@ -2968,10 +2966,10 @@ rec { plugins = [ MPlayerPlugin ] - ++ optional (system == "i686-linux") flashplayer + ++ lib.optional (system == "i686-linux") flashplayer # RealPlayer is disabled by default for legal reasons. - ++ optional (system != "i686-linux" && getConfig ["firefox" "enableRealPlayer"] false) RealPlayer - ++ optional (supportsJDK && jrePlugin ? mozillaPlugin) jrePlugin; + ++ lib.optional (system != "i686-linux" && getConfig ["firefox" "enableRealPlayer"] false) RealPlayer + ++ lib.optional (supportsJDK && jrePlugin ? mozillaPlugin) jrePlugin; }; xara = import ../applications/graphics/xara { |