From 76125fb2bc0ec33715ae077f8113ec9c73397a9d Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 17 Oct 2006 08:00:50 +0000 Subject: [PATCH] * Remove the workaround for NIXPKGS-30. * Add MythTV to the channel. svn path=/nixpkgs/trunk/; revision=6741 --- pkgs/applications/video/mythtv/default.nix | 7 ++----- pkgs/top-level/build-for-release.nix | 1 + 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/video/mythtv/default.nix b/pkgs/applications/video/mythtv/default.nix index c4b40178b32..148612834f8 100644 --- 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"; } diff --git a/pkgs/top-level/build-for-release.nix b/pkgs/top-level/build-for-release.nix index 8e896aa4f33..87795641d58 100644 --- 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