From 065e85e8add709b5b3a3b2fe243fde9c41bea022 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Mon, 14 Nov 2022 23:20:51 +0000 Subject: [PATCH] libstroke: use xorg.* packages directly instead of xlibsWrapper indirection Validated as no change in `out` output with `diffoscope`. --- pkgs/development/libraries/libstroke/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libstroke/default.nix b/pkgs/development/libraries/libstroke/default.nix index d40b5b6b04921..698fa5c579f70 100644 --- a/pkgs/development/libraries/libstroke/default.nix +++ b/pkgs/development/libraries/libstroke/default.nix @@ -1,4 +1,10 @@ -{lib, stdenv, fetchurl, automake, autoconf, xlibsWrapper}: +{ lib +, stdenv +, fetchurl +, automake +, autoconf +, libX11 +}: stdenv.mkDerivation rec { pname = "libstroke"; @@ -10,7 +16,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ automake autoconf ]; - buildInputs = [ xlibsWrapper ]; + buildInputs = [ libX11 ]; # libstroke ships with an ancient config.sub that doesn't know about x86_64, so regenerate it. # Also, modern automake doesn't like things and returns error code 63. But it generates the file.