Unverified Commit 4d43f178 authored by Sergei Trofimovich's avatar Sergei Trofimovich Committed by GitHub
Browse files

Merge pull request #204344 from trofi/fox_1_6-without-xlibsWrapper 

fox_1_6: use xorg.* packages directly instead of xlibsWrapper indirec…
parents 4d551978 d6ba0135

pkgs/development/libraries/fox/fox-1.6.nix

+20 −5
Original line number Diff line number Diff line 
{ lib, stdenv, fetchurl, xlibsWrapper, libpng, libjpeg, libtiff, zlib, bzip2, libXcursor

, libXrandr, libGLU, libGL, libXft, libXfixes, xinput

, CoreServices }:

{ lib

, stdenv

, fetchurl

, libpng

, libjpeg

, libtiff

, zlib

, bzip2

, libXcursor

, libXrandr

, libGLU

, libGL

, libXext

, libXft

, libXfixes

, xinput

, CoreServices

}:



stdenv.mkDerivation rec {

  pname = "fox";
@@ -12,8 +27,8 @@ stdenv.mkDerivation rec { 
  };



  buildInputs = [

    xlibsWrapper libpng libjpeg libtiff zlib bzip2 libXcursor libXrandr

    libXft libGLU libGL libXfixes xinput

    libpng libjpeg libtiff zlib bzip2 libXcursor libXrandr

    libXext libXft libGLU libGL libXfixes xinput

  ] ++ lib.optional stdenv.isDarwin CoreServices;



  doCheck = true;