ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-25 12:22:37 +03:00
Code Issues Projects Releases Wiki Activity

Merging from trunk. The previous merge took the firefox 3.6 in a bad state.

Browse Source 
svn path=/nixpkgs/branches/stdenv-updates/; revision=25202
This commit is contained in:
Lluís Batlle i Rossell 2010-12-19 20:12:10 +00:00
parent cd6de2880f
commit 22253677b3
4 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/networking/browsers/firefox/3.6.nix
View File

@ -111,10 +111,6 @@ rec {
inherit src;
# To be removed when the change gets upstream. I don't know if the patch
# affects xulrunner or firefox.
patches = [ ./symlinks-bug551152.patch ];
buildInputs =
[ pkgconfig gtk perl zip libIDL libjpeg zlib cairo bzip2 python
dbus dbus_glib pango freetype fontconfig alsaLib nspr libnotify

6
pkgs/applications/video/kmplayer/default.nix
View File

@ -1,10 +1,10 @@
{stdenv, fetchurl, lib, cmake, qt4, perl, gettext, pango, gtk, dbus_glib, kdelibs, automoc4, phonon}:
stdenv.mkDerivation {
name = "kmplayer-0.11.2b";
name = "kmplayer-0.11.2c";
src = fetchurl {
url = http://kmplayer.kde.org/pkgs/kmplayer-0.11.2b.tar.bz2;
sha256 = "00a1pw31p849cbgskyfi8jni9ar6yi2ivr625vza2za6apdxvkr7";
url = http://kmplayer.kde.org/pkgs/kmplayer-0.11.2c.tar.bz2;
sha256 = "1qhafq865bzpz6m9k7cjdv4884qfpn481ak77ly0nidpq2ab0l9m";
};
builder = ./builder.sh;
buildInputs = [ cmake qt4 perl gettext stdenv.gcc.libc pango gtk dbus_glib kdelibs automoc4 phonon ];

13
pkgs/tools/misc/memtest86/default.nix
View File

@ -1,11 +1,11 @@
{stdenv, fetchurl}:
{ stdenv, fetchurl }:
stdenv.mkDerivation {
name = "memtest86+-4.00";
name = "memtest86+-4.10";
src = fetchurl {
url = http://www.memtest.org/download/4.00/memtest86+-4.00.tar.gz;
sha256 = "193chqvwmcxsrvpcfy3mbz1vakvpfhxvjmawzidp26x8kma2zi3f";
url = http://www.memtest.org/download/4.10/memtest86+-4.10.tar.gz;
sha256 = "0kxa2m7vfcm543wp53fv16sjjf5p12mzdz5rm87mrrr6hw43a6gq";
};
preBuild = ''
@ -17,10 +17,7 @@ stdenv.mkDerivation {
fi
'';
# Override the default optimisation setting (`-Os') to prevent lots
# of spurious errors. See
# https://bugs.launchpad.net/fedora/+source/memtest86+/+bug/246412.
NIX_CFLAGS_COMPILE = "-O1 -I.";
NIX_CFLAGS_COMPILE = "-I.";
installPhase = ''
ensureDir $out

4
pkgs/tools/package-management/disnix/disnixos/default.nix
View File

@ -3,8 +3,8 @@
stdenv.mkDerivation {
name = "disnixos";
src = fetchurl {
url = http://hydra.nixos.org/build/811135/download/1/disnixos-0.1pre25150.tar.gz;
sha256 = "004i4k0c9lfvfmmv5iqwnqk3h2lip166dp8vpn3k3mvmpl17cn3j";
url = http://hydra.nixos.org/build/812999/download/1/disnixos-0.1pre25200.tar.gz;
sha256 = "1cw0wg5x65nanrjfj67nk1jxngaqh2l7msx03s536hssm9g2mv7r";
};
buildInputs = [ socat pkgconfig disnix ];
dontStrip = true;