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

fix the last master merge, sorry for the problems

Browse Source 
Now I carefully re-merged all the conflicts and tested some builds.
Hopefully it's all OK now.
This commit is contained in:
Vladimír Čunát 2013-03-02 22:34:37 +01:00
parent d9a2b1f520
commit d7abc31f5a
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkgs/applications/networking/browsers/chromium/default.nix
View File

@ -127,7 +127,6 @@ in stdenv.mkDerivation rec {
patches = optional cupsSupport ./cups_allow_deprecated.patch patches = optional cupsSupport ./cups_allow_deprecated.patch
++ optional pulseSupport ./pulseaudio_array_bounds.patch ++ optional pulseSupport ./pulseaudio_array_bounds.patch
++ optional post25 ./clone_detached.patch ++ optional post25 ./clone_detached.patch
++ optional post25 ./clone_detached.patch
++ [ ./glibc-2.16-use-siginfo_t.patch ]; ++ [ ./glibc-2.16-use-siginfo_t.patch ];
postPatch = '' postPatch = ''

5
pkgs/os-specific/linux/qemu-kvm/default.nix
View File

@ -14,14 +14,13 @@ stdenv.mkDerivation rec {
sha256 = "018vb5nmk2fsm143bs2bl2wirhasd4b10d7jchl32zik4inbk2p9"; sha256 = "018vb5nmk2fsm143bs2bl2wirhasd4b10d7jchl32zik4inbk2p9";
}; };
patches = [ ./fix-librt-check.patch ];
buildInputs = buildInputs =
[ attr zlib SDL alsaLib pkgconfig pciutils libuuid vde2 libjpeg libpng [ attr zlib SDL alsaLib pkgconfig pciutils libuuid vde2 libjpeg libpng
ncurses python glib libaio mesa texinfo perl ncurses python glib libaio mesa texinfo perl
] ++ stdenv.lib.optionals spiceSupport [ spice_protocol spice ]; ] ++ stdenv.lib.optionals spiceSupport [ spice_protocol spice ];
patchPhase = "patchShebangs ." + stdenv.lib.optionalString spiceSupport '' patches = [ ./fix-librt-check.patch ];
postPatch = "patchShebangs ." + stdenv.lib.optionalString spiceSupport ''
for i in configure spice-qemu-char.c ui/spice-input.c ui/spice-core.c ui/qemu-spice.h; do for i in configure spice-qemu-char.c ui/spice-input.c ui/spice-core.c ui/qemu-spice.h; do
substituteInPlace $i --replace '#include <spice.h>' '#include <spice/spice.h>' substituteInPlace $i --replace '#include <spice.h>' '#include <spice/spice.h>'
done done