forked from mirrors/nixpkgs
xfe: use xorg.* packages directly instead of xlibsWrapper indirection
Tested as no material change in `out` output with `diffoscope`.
This commit is contained in:
parent
229fa2fd6d
commit
593929c748
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue