From 26e718ba2399ec017d193a346651a11d3e133ba4 Mon Sep 17 00:00:00 2001 From: Marc Weber Date: Wed, 19 May 2010 10:01:07 +0000 Subject: move assertions so that buildign the NixOS manual doesn't fail svn path=/nixpkgs/trunk/; revision=21855 --- pkgs/os-specific/linux/ati-drivers/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/ati-drivers/default.nix b/pkgs/os-specific/linux/ati-drivers/default.nix index 0a3a90ae653d..9c936544034c 100644 --- a/pkgs/os-specific/linux/ati-drivers/default.nix +++ b/pkgs/os-specific/linux/ati-drivers/default.nix @@ -12,9 +12,6 @@ # See http://thread.gmane.org/gmane.linux.distributions.nixos/4145 for a # workaround (TODO) -assert xorg.xorgserver.name == "xorg-server-1.7.5"; -assert stdenv.system == "x86_64-linux"; # i686-linux should work as well - however I didn't test it. - # The gentoo ebuild contains much more magic.. let lib = stdenv.lib; @@ -58,4 +55,12 @@ stdenv.mkDerivation { maintainers = [stdenv.lib.maintainers.marcweber]; platforms = stdenv.lib.platforms.linux; }; + + # moved assertions here because the name is evaluated when the NixOS manual is generated + # Don't make that fail - fail lazily when a users tries to build this derivation only + dummy = + assert xorg.xorgserver.name == "xorg-server-1.7.5"; + assert stdenv.system == "x86_64-linux"; # i686-linux should work as well - however I didn't test it. + null; + } -- cgit 1.4.1