From b4530d1ed4f3dc5cbf1d2a08fb8ed4cbb5b94114 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 29 Oct 2022 23:03:46 +0100 Subject: [PATCH] povray: use xorg.* packages directly instead of xlibsWrapper indirection Tested as no material change in `out` output with `diffoscope`. --- pkgs/tools/graphics/povray/default.nix | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/graphics/povray/default.nix b/pkgs/tools/graphics/povray/default.nix index 537e5d0a6db0..f9a08543fb95 100644 --- a/pkgs/tools/graphics/povray/default.nix +++ b/pkgs/tools/graphics/povray/default.nix @@ -1,5 +1,17 @@ -{ lib, stdenv, fetchFromGitHub, autoconf, automake, boost -, zlib, libpng, libjpeg, libtiff, xlibsWrapper, SDL +{ lib +, stdenv +, fetchFromGitHub +, autoconf +, automake +, boost +, zlib +, libX11 +, libICE +, libSM +, libpng +, libjpeg +, libtiff +, SDL }: stdenv.mkDerivation rec { @@ -14,7 +26,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ automake autoconf ]; - buildInputs = [ boost zlib libpng libjpeg libtiff xlibsWrapper SDL ]; + buildInputs = [ boost zlib libX11 libICE libSM libpng libjpeg libtiff 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