From 30b0c8fec939fd648be77aed5f155e4e5fbb0039 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Wed, 5 Oct 2022 20:04:31 -0700 Subject: pcb: use xorg.* packages directly instead of xlibsWrapper As recommended by https://github.com/NixOS/nixpkgs/issues/194054 Built outputs (`x86-linux`) are identical except for the `pcb` binary, which was manually reviewed with `vbindiff` to confirm that the only differences were self-$out path references. --- pkgs/applications/science/electronics/pcb/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'pkgs/applications/science/electronics/pcb/default.nix') diff --git a/pkgs/applications/science/electronics/pcb/default.nix b/pkgs/applications/science/electronics/pcb/default.nix index d28f1d18121..f8623d9a7bf 100644 --- a/pkgs/applications/science/electronics/pcb/default.nix +++ b/pkgs/applications/science/electronics/pcb/default.nix @@ -8,7 +8,8 @@ , netpbm , imagemagick , dbus -, xlibsWrapper +, freetype +, fontconfig , libGLU , libGL , shared-mime-info @@ -40,7 +41,9 @@ stdenv.mkDerivation rec { buildInputs = [ gtk2 dbus - xlibsWrapper + xorg.libXrender + freetype + fontconfig libGLU libGL tcl -- cgit 1.4.1