Author: eelco
Date: Wed May 4 12:52:46 2011
New Revision: 27143
URL: https://svn.nixos.org/websvn/nix/?rev=27143&sc=1
Log:
* Fix nix-env evaluation errors on non-Linux platforms.
Modified:
nixpkgs/trunk/pkgs/applications/audio/lash/default.nix
nixpkgs/trunk/pkgs/applications/audio/yoshimi/default.nix
Modified: nixpkgs/trunk/pkgs/applications/audio/lash/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/applications/audio/lash/default.nix Wed May 4
12:45:05 2011 (r27142)
+++ nixpkgs/trunk/pkgs/applications/audio/lash/default.nix Wed May 4
12:52:46 2011 (r27143)
@@ -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 @@
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;
Modified: nixpkgs/trunk/pkgs/applications/audio/yoshimi/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/applications/audio/yoshimi/default.nix Wed May 4
12:45:05 2011 (r27142)
+++ nixpkgs/trunk/pkgs/applications/audio/yoshimi/default.nix Wed May 4
12:52:46 2011 (r27143)
@@ -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}";
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
