mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-10-31 22:51:22 +00:00
* Remove the workaround for NIXPKGS-30.
* Add MythTV to the channel. svn path=/nixpkgs/trunk/; revision=6741
This commit is contained in:
parent
6aefff0061
commit
76125fb2bc
@ -1,6 +1,7 @@
|
|||||||
{ stdenv, fetchurl, which, qt3, x11
|
{ stdenv, fetchurl, which, qt3, x11
|
||||||
, libX11, libXinerama, libXv, libXxf86vm, libXrandr, libXmu
|
, libX11, libXinerama, libXv, libXxf86vm, libXrandr, libXmu
|
||||||
, lame, zlib, mesa}:
|
, lame, zlib, mesa
|
||||||
|
}:
|
||||||
|
|
||||||
assert qt3.mysqlSupport;
|
assert qt3.mysqlSupport;
|
||||||
|
|
||||||
@ -25,8 +26,4 @@ stdenv.mkDerivation {
|
|||||||
./settings.patch
|
./settings.patch
|
||||||
./purity.patch # don't search in /usr/include etc.
|
./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";
|
|
||||||
}
|
}
|
||||||
|
@ -76,6 +76,7 @@ let {
|
|||||||
mktemp
|
mktemp
|
||||||
mono
|
mono
|
||||||
mysql
|
mysql
|
||||||
|
mythtv
|
||||||
nix
|
nix
|
||||||
nxml
|
nxml
|
||||||
# octave
|
# octave
|
||||||
|
Loading…
Reference in New Issue
Block a user