From f3f06e76f46d9b497e36bfa3157f061561ccfa8a Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Tue, 4 Oct 2022 22:21:53 +0100 Subject: [PATCH] x11_ssh_askpass use xorg.* packages directly instead of xlibsWrapper indirection Validated as no change in `out` and `man` outputs with diffoscope on `x11_ssh_askpass` expression. --- pkgs/tools/networking/x11-ssh-askpass/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/x11-ssh-askpass/default.nix b/pkgs/tools/networking/x11-ssh-askpass/default.nix index 87bd5c77c335..049154d64413 100644 --- a/pkgs/tools/networking/x11-ssh-askpass/default.nix +++ b/pkgs/tools/networking/x11-ssh-askpass/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, xlibsWrapper, imake, gccmakedep }: +{ lib, stdenv, fetchurl, xorg, imake, gccmakedep }: stdenv.mkDerivation rec { pname = "x11-ssh-askpass"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ imake gccmakedep ]; - buildInputs = [ xlibsWrapper ]; + buildInputs = [ xorg.libX11 xorg.libXt xorg.libICE xorg.libSM ]; configureFlags = [ "--with-app-defaults-dir=$out/etc/X11/app-defaults"