* Remove the workaround for NIXPKGS-30.

* Add MythTV to the channel. svn path=/nixpkgs/trunk/; revision=6741
2006-10-17 08:00:50 +00:00 · 2006-10-17 08:00:50 +00:00 · 76125fb2bc
commit 76125fb2bc
parent 6aefff0061
2 changed files with 3 additions and 5 deletions
--- a/pkgs/applications/video/mythtv/default.nix
+++ b/pkgs/applications/video/mythtv/default.nix
@ -1,6 +1,7 @@
 { stdenv, fetchurl, which, qt3, x11
 , libX11, libXinerama, libXv, libXxf86vm, libXrandr, libXmu
-, lame, zlib, mesa}:
+, lame, zlib, mesa
+}:

 assert qt3.mysqlSupport;

@ -25,8 +26,4 @@ stdenv.mkDerivation {
    ./settings.patch
    ./purity.patch # don't search in /usr/include etc.
  ];
-
-  /* Quick workaround for NIXPKGS-30 to get floor() etc. to work in
-     MythTV.  Can be removed once NIXPKGS-30 has been fixed. */
-  NIX_CFLAGS_COMPILE = "-ffast-math";
 }
--- a/pkgs/top-level/build-for-release.nix
+++ b/pkgs/top-level/build-for-release.nix
@ -76,6 +76,7 @@ let {
    mktemp
    mono
    mysql
+    mythtv
    nix
    nxml
 #    octave