3
0
Fork 0
forked from mirrors/nixpkgs

Merge pull request #194492 from trofi/x11_ssh_askpass-without-xlibsWrapper

x11_ssh_askpass use xorg.* packages directly instead of xlibsWrapper …
This commit is contained in:
Sergei Trofimovich 2022-10-08 07:14:11 +01:00 committed by GitHub
commit a07b8816bd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, xlibsWrapper, imake, gccmakedep }: { lib, stdenv, fetchurl, xorg, imake, gccmakedep }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "x11-ssh-askpass"; pname = "x11-ssh-askpass";
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ imake gccmakedep ]; nativeBuildInputs = [ imake gccmakedep ];
buildInputs = [ xlibsWrapper ]; buildInputs = [ xorg.libX11 xorg.libXt xorg.libICE xorg.libSM ];
configureFlags = [ configureFlags = [
"--with-app-defaults-dir=$out/etc/X11/app-defaults" "--with-app-defaults-dir=$out/etc/X11/app-defaults"