summary refs log tree commit diff
diff options
context:
space:
mode:
authorSergei Trofimovich <slyich@gmail.com>2022-10-29 22:41:03 +0100
committerBjørn Forsman <bjorn.forsman@gmail.com>2022-10-30 11:24:24 +0100
commitd5b82c0a63c9faea8109c04f243aab7dafb2cd76 (patch)
treef889b7f933e815f1c9a907fceca2dc6dd4a489df
parentb4530d1ed4f3dc5cbf1d2a08fb8ed4cbb5b94114 (diff)
downloadnixpkgs-d5b82c0a63c9faea8109c04f243aab7dafb2cd76.tar
nixpkgs-d5b82c0a63c9faea8109c04f243aab7dafb2cd76.tar.gz
nixpkgs-d5b82c0a63c9faea8109c04f243aab7dafb2cd76.tar.bz2
nixpkgs-d5b82c0a63c9faea8109c04f243aab7dafb2cd76.tar.lz
nixpkgs-d5b82c0a63c9faea8109c04f243aab7dafb2cd76.tar.xz
nixpkgs-d5b82c0a63c9faea8109c04f243aab7dafb2cd76.tar.zst
nixpkgs-d5b82c0a63c9faea8109c04f243aab7dafb2cd76.zip
fox: use xorg.* packages directly instead of xlibsWrapper indirection
Tested as no material change in `out` output with `diffoscope`.
-rw-r--r--pkgs/development/libraries/fox/default.nix18
1 files changed, 15 insertions, 3 deletions
diff --git a/pkgs/development/libraries/fox/default.nix b/pkgs/development/libraries/fox/default.nix
index 14233488844..2eda944048a 100644
--- a/pkgs/development/libraries/fox/default.nix
+++ b/pkgs/development/libraries/fox/default.nix
@@ -1,5 +1,17 @@
-{ lib, stdenv, fetchurl, xlibsWrapper, libpng, libjpeg, libtiff, zlib, bzip2, libXcursor, libXrandr, libXft
-, CoreServices ? null }:
+{ lib
+, stdenv
+, fetchurl
+, libpng
+, libjpeg
+, libtiff
+, zlib
+, bzip2
+, libXcursor
+, libXext
+, libXrandr
+, libXft
+, CoreServices ? null
+}:
 
 stdenv.mkDerivation rec {
   pname = "fox";
@@ -12,7 +24,7 @@ stdenv.mkDerivation rec {
 
   patches = [ ./clang.patch ];
 
-  buildInputs = [ libpng xlibsWrapper libjpeg libtiff zlib bzip2 libXcursor libXrandr libXft ]
+  buildInputs = [ libpng libjpeg libtiff zlib bzip2 libXcursor libXext libXrandr libXft ]
     ++ lib.optional stdenv.isDarwin CoreServices;
 
   doCheck = true;