diff options
author | Sergei Trofimovich <slyich@gmail.com> | 2022-10-29 16:45:11 +0100 |
---|---|---|
committer | Bjørn Forsman <bjorn.forsman@gmail.com> | 2022-10-30 11:36:21 +0100 |
commit | 593929c7484e1113b6759c69bcd27993b7fa2347 (patch) | |
tree | 2b825487e178dd16ee352eb097bea5345c23b318 | |
parent | 229fa2fd6da968085fc3a4225c5ed84ab76fc02b (diff) |
xfe: use xorg.* packages directly instead of xlibsWrapper indirection
Tested as no material change in `out` output with `diffoscope`.
-rw-r--r-- | pkgs/applications/file-managers/xfe/default.nix | 29 |
1 files changed, 27 insertions, 2 deletions
diff --git a/pkgs/applications/file-managers/xfe/default.nix b/pkgs/applications/file-managers/xfe/default.nix index 1603639378402..92b3fae315968 100644 --- a/pkgs/applications/file-managers/xfe/default.nix +++ b/pkgs/applications/file-managers/xfe/default.nix @@ -1,4 +1,18 @@ -{ lib, stdenv, fetchurl, fox, pkg-config, gettext, xlibsWrapper, xcbutil, gcc, intltool, file, libpng }: +{ lib +, stdenv +, fetchurl +, fox +, fontconfig +, freetype +, pkg-config +, gettext +, xcbutil +, gcc +, intltool +, file +, libpng +, xorg +}: stdenv.mkDerivation rec { pname = "xfe"; @@ -10,7 +24,18 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config intltool ]; - buildInputs = [ fox gettext xlibsWrapper xcbutil gcc file libpng ]; + buildInputs = [ + fox + gettext + xcbutil + gcc + file + libpng + fontconfig + freetype + xorg.libX11 + xorg.libXft + ]; preConfigure = '' sed -i s,/usr/share/xfe,$out/share/xfe, src/xfedefs.h |