BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #14220 from joachifm/build-fixes-for-staging

Browse source 
Build fixes for staging
This commit is contained in:
joachifm 2016-03-26 17:17:47 +00:00
commit a3d5686652
5 changed files with 30 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/applications/graphics/hugin/default.nix
View file

@ -1,6 +1,6 @@
{ stdenv, cmake, fetchurl, gnumake, pkgconfig, makeWrapper
, boost, gettext, tclap, wxGTK
, freeglut, glew, libXi, libXmu, mesa
, freeglut, glew, libX11, libXi, libXmu, mesa, cairo
, autopanosiftc, enblend-enfuse, exiv2, fftw, ilmbase, lensfun, libpng, libtiff
, openexr, panotools, perlPackages, sqlite, vigra
}:
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR";
buildInputs = [ boost gettext tclap wxGTK
freeglut glew libXi libXmu mesa
freeglut glew libX11 libXi libXmu mesa cairo
exiv2 fftw ilmbase lensfun libtiff libpng openexr panotools
sqlite vigra
perlPackages.ImageExifTool makeWrapper

5
pkgs/applications/graphics/leocad/default.nix
View file

@ -16,8 +16,11 @@ stdenv.mkDerivation rec {
buildInputs = [ qt4 zlib ];
prefixKey="INSTALL_PREFIX=";
prefixKey = "INSTALL_PREFIX=";
configureScript = "qmake leocad.pro";
postPatch = ''
substituteInPlace common/camera.cpp --replace "isnan(" "std::isnan("
'';
meta = with stdenv.lib; {
description = "CAD program for creating virtual LEGO models";

13
pkgs/games/zoom/default.nix
View file

@ -2,21 +2,26 @@
# !!! assert freetype == xorg.freetype
stdenv.mkDerivation {
stdenv.mkDerivation rec {
name = "zoom-1.1.5";
src = fetchurl {
url = http://www.logicalshift.co.uk/unix/zoom/zoom-1.1.5.tar.gz;
url = "http://www.logicalshift.co.uk/unix/zoom/${name}.tar.gz";
sha256 = "1g6van7f7sg3zfcz80mncnnbccyg2hnm0hq4x558vpsm0lf7z5pj";
};
buildInputs = [ perl expat xlibsWrapper freetype ];
NIX_CFLAGS_COMPILE = [
# Zoom doesn't add the right directory in the include path.
CFLAGS = [ "-I" (freetype + "/include/freetype2") ];
"-I" (freetype + "/include/freetype2")
# for gcc5; c11 inline semantics breaks the build
"-fgnu89-inline"
];
meta = with stdenv.lib; {
description = "Player for Z-Code, TADS and HUGO stories or games, usually text adventures ('interactive fiction')";
description = "Player for Z-Code, TADS and HUGO stories or games";
longDescription = ''
Zoom is a player for Z-Code, TADS and HUGO stories or games. These are
usually text adventures ('interactive fiction'), and were first created

6
pkgs/tools/filesystems/udftools/default.nix
View file

@ -10,9 +10,15 @@ stdenv.mkDerivation rec {
buildInputs = [ ncurses readline ];
NIX_CFLAGS_COMPILE = "-std=gnu90";
preConfigure = ''
sed -e '1i#include <limits.h>' -i cdrwtool/cdrwtool.c -i pktsetup/pktsetup.c
sed -e 's@[(]char[*][)]spm [+]=@spm = ((char*) spm) + @' -i wrudf/wrudf.c
sed -e '27i#include <string.h>' -i include/udf_endian.h
sed -e '38i#include <string.h>' -i wrudf/wrudf-cdrw.c
sed -e '12i#include <string.h>' -i wrudf/wrudf-cdr.c
sed -e '37i#include <stdlib.h>' -i wrudf/ide-pc.c
'';
meta = with stdenv.lib; {

8
pkgs/tools/misc/yad/default.nix
View file

@ -13,10 +13,18 @@ stdenv.mkDerivation rec {
"--enable-icon-browser"
];
# for gcc5: c11 inline semantics breaks the build
NIX_CFLAGS_COMPILE = "-fgnu89-inline";
buildInputs = [ gtk2 ];
nativeBuildInputs = [ pkgconfig intltool ];
postPatch = ''
sed -i src/file.c -e '21i#include <glib/gprintf.h>'
sed -i src/form.c -e '21i#include <stdlib.h>'
'';
preFixup = "rm $out/share/icons/hicolor/icon-theme.cache";
meta = {