Merge pull request #31988 from Baughn/povray

povray: Add X11/SDL preview support
This commit is contained in:
Jörg Thalheim 2017-11-24 20:07:12 +00:00 committed by GitHub
commit 8b237dbd2f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, autoconf, automake, boost
, zlib, libpng, libjpeg, libtiff
, zlib, libpng, libjpeg, libtiff, x11, SDL
}:
stdenv.mkDerivation rec {
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [ autoconf automake boost zlib libpng libjpeg libtiff ];
buildInputs = [ autoconf automake boost zlib libpng libjpeg libtiff x11 SDL ];
# the installPhase wants to put files into $HOME. I let it put the files
# to $TMPDIR, so they don't get into the $out
@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
sed -i -e 's/^povgroup.*/povgroup=nogroup/' Makefile.{am,in}
'';
configureFlags = [ "COMPILED_BY='nix'" "--with-boost-thread=boost_thread" ];
configureFlags = [ "COMPILED_BY='nix'" "--with-boost-thread=boost_thread" "--with-x" ];
enableParallelBuilding = true;