From d5d5aa68012b489dc0e2c0ba035e7cfb0f153620 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 4 May 2011 12:52:46 +0000 Subject: [PATCH] * Fix nix-env evaluation errors on non-Linux platforms. svn path=/nixpkgs/trunk/; revision=27143 --- pkgs/applications/audio/lash/default.nix | 8 +++++--- pkgs/applications/audio/yoshimi/default.nix | 6 ++++-- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/audio/lash/default.nix b/pkgs/applications/audio/lash/default.nix index f0f9e491c37..3bbc9e4277b 100644 --- a/pkgs/applications/audio/lash/default.nix +++ b/pkgs/applications/audio/lash/default.nix @@ -1,5 +1,7 @@ -{ stdenv, fetchurl, alsaLib, gtk, jackaudio, libuuid, libxml2, -makeWrapper, pkgconfig, readline }: +{ stdenv, fetchurl, alsaLib, gtk, jackaudio, libuuid, libxml2 +, makeWrapper, pkgconfig, readline }: + +assert libuuid != null; stdenv.mkDerivation rec { name = "lash-${version}"; @@ -24,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "LASH Audio Session Handler"; longDescription = '' - session management system for GNU/Linux audio applications + Session management system for GNU/Linux audio applications. ''; homepage = http://www.nongnu.org/lash; license = licenses.gpl2Plus; diff --git a/pkgs/applications/audio/yoshimi/default.nix b/pkgs/applications/audio/yoshimi/default.nix index c9ca27f13f3..1dda4be3739 100644 --- a/pkgs/applications/audio/yoshimi/default.nix +++ b/pkgs/applications/audio/yoshimi/default.nix @@ -1,5 +1,7 @@ -{ stdenv, fetchurl, alsaLib, boost, cmakeCurses, fftwSinglePrec, fltk, -jackaudio, libsndfile, mesa, minixml, pkgconfig, zlib }: +{ stdenv, fetchurl, alsaLib, boost, cmakeCurses, fftwSinglePrec, fltk +, jackaudio, libsndfile, mesa, minixml, pkgconfig, zlib }: + +assert stdenv ? glibc; stdenv.mkDerivation rec { name = "yoshimi-${version}";