From 791a23a00a8575400250ac8eaa6b844aefb23989 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Mon, 14 Nov 2022 19:21:12 +0000 Subject: [PATCH] ncview: use xorg.* packages directly instead of xlibsWrapper indirection Validated as no change in `out` output with `diffoscope`. --- pkgs/tools/X11/ncview/default.nix | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/X11/ncview/default.nix b/pkgs/tools/X11/ncview/default.nix index c22c6c0eb38..2b2aac5f66b 100644 --- a/pkgs/tools/X11/ncview/default.nix +++ b/pkgs/tools/X11/ncview/default.nix @@ -1,5 +1,11 @@ -{ lib, stdenv, fetchurl -, netcdf, xlibsWrapper, xorg, udunits, expat +{ lib +, stdenv +, fetchurl +, expat +, libpng +, udunits +, netcdf +, xorg }: let @@ -14,7 +20,17 @@ in stdenv.mkDerivation { sha256 = "1gliziyxil2fcz85hj6z0jq33avrxdcjs74d500lhxwvgd8drfp8"; }; - buildInputs = [ netcdf xlibsWrapper xorg.libXaw udunits expat ]; + buildInputs = [ + expat + libpng + netcdf + udunits + xorg.libICE + xorg.libSM + xorg.libX11 + xorg.libXaw + xorg.libXt + ]; meta = with lib; { description = "Visual browser for netCDF format files";