JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

move assertions so that buildign the NixOS manual doesn't fail

Browse Source 
svn path=/nixpkgs/trunk/; revision=21855
This commit is contained in:
Marc Weber 2010-05-19 10:01:07 +00:00
parent fa9b6ef08d
commit 26e718ba23
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/os-specific/linux/ati-drivers/default.nix
View File

@ -12,9 +12,6 @@
# See http://thread.gmane.org/gmane.linux.distributions.nixos/4145 for a # See http://thread.gmane.org/gmane.linux.distributions.nixos/4145 for a
# workaround (TODO) # 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.. # The gentoo ebuild contains much more magic..
let lib = stdenv.lib; let lib = stdenv.lib;
@ -58,4 +55,12 @@ stdenv.mkDerivation {
maintainers = [stdenv.lib.maintainers.marcweber]; maintainers = [stdenv.lib.maintainers.marcweber];
platforms = stdenv.lib.platforms.linux; 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;
} }