From 7824b4856caf1312598d68df3f65c65747a4d49b Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Tue, 25 Oct 2022 22:55:08 +0100 Subject: [PATCH] rss-glx: use xorg.* packages directly instead of xlibsWrapper Validated as no change in `out` outputs with `diffoscope`. --- pkgs/misc/screensavers/rss-glx/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/screensavers/rss-glx/default.nix b/pkgs/misc/screensavers/rss-glx/default.nix index a90b5d65653e..2bcb42e85ec5 100644 --- a/pkgs/misc/screensavers/rss-glx/default.nix +++ b/pkgs/misc/screensavers/rss-glx/default.nix @@ -3,7 +3,7 @@ , fetchurl , autoconf , pkg-config -, xlibsWrapper +, libX11 , libXext , libGLU , libGL @@ -22,14 +22,13 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ autoconf pkg-config ]; - buildInputs = [ libGLU libGL xlibsWrapper imagemagick6 libtiff bzip2 ]; + buildInputs = [ libGLU libGL libX11 libXext imagemagick6 libtiff bzip2 ]; patches = [ ./cstddef.patch ]; NIX_CFLAGS_COMPILE = "-I${imagemagick6.dev}/include/ImageMagick"; - NIX_LDFLAGS= "-rpath ${libXext}/lib"; meta = { description = "Really Slick Screensavers Port to GLX";