From 75633a59b1d26d41fd306487548f00c6afbcc7a8 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 29 Oct 2022 09:13:14 +0100 Subject: xspim: use xorg.* packages directly instead of xlibsWrapper indirection Tested as no material change in `out` output with `diffoscope`. --- pkgs/development/tools/misc/xspim/default.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'pkgs/development/tools/misc/xspim') diff --git a/pkgs/development/tools/misc/xspim/default.nix b/pkgs/development/tools/misc/xspim/default.nix index 6e11c81cbde03..808e9f92da71a 100644 --- a/pkgs/development/tools/misc/xspim/default.nix +++ b/pkgs/development/tools/misc/xspim/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchsvn, imake, bison, flex, xlibsWrapper, libXaw, libXpm, ... }: +{ lib, stdenv, fetchsvn, imake, bison, flex, xorg }: stdenv.mkDerivation rec { pname = "xspim"; @@ -11,7 +11,16 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ imake bison flex ]; - buildInputs = [ xlibsWrapper libXaw libXpm ]; + buildInputs = [ + xorg.libICE + xorg.libSM + xorg.libX11 + xorg.libXaw + xorg.libXext + xorg.libXmu + xorg.libXpm + xorg.libXt + ]; preConfigure = '' cd xspim -- cgit 1.4.1