From 42d1e057e015205503715ad970f2c4ac65bba329 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliv=C3=A9r=20Falvai?= Date: Sun, 10 Nov 2024 19:58:21 +0100 Subject: [PATCH 1/2] fox: fix darwin builds https://hydra.nixos.org/build/276146939/nixlog/1/tail --- pkgs/development/libraries/fox/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/fox/default.nix b/pkgs/development/libraries/fox/default.nix index 68a9806cf47f..5f5d7ecd0821 100644 --- a/pkgs/development/libraries/fox/default.nix +++ b/pkgs/development/libraries/fox/default.nix @@ -11,6 +11,7 @@ , libXext , libXrandr , libXft +, cups }: stdenv.mkDerivation rec { @@ -22,7 +23,9 @@ stdenv.mkDerivation rec { sha256 = "sha256-bu+IEqNkv9OAf96dPYre3CP759pjalVIbYyc3QSQW2w="; }; - buildInputs = [ libpng libjpeg libtiff zlib bzip2 mesa_glu libXcursor libXext libXrandr libXft ]; + buildInputs = [ libpng libjpeg libtiff zlib bzip2 mesa_glu libXcursor libXext libXrandr libXft ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + cups + ]; doCheck = true; From 3b553ac37d821ba2d8211cfdad4511d64cc0b6c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliv=C3=A9r=20Falvai?= Date: Sun, 10 Nov 2024 19:59:09 +0100 Subject: [PATCH 2/2] fox: format with nixfmt-rfc-style --- pkgs/development/libraries/fox/default.nix | 48 ++++++++++++++-------- 1 file changed, 31 insertions(+), 17 deletions(-) diff --git a/pkgs/development/libraries/fox/default.nix b/pkgs/development/libraries/fox/default.nix index 5f5d7ecd0821..26ecbc9ed7fd 100644 --- a/pkgs/development/libraries/fox/default.nix +++ b/pkgs/development/libraries/fox/default.nix @@ -1,17 +1,18 @@ -{ lib -, stdenv -, fetchurl -, libpng -, libjpeg -, libtiff -, zlib -, bzip2 -, mesa_glu -, libXcursor -, libXext -, libXrandr -, libXft -, cups +{ + lib, + stdenv, + fetchurl, + libpng, + libjpeg, + libtiff, + zlib, + bzip2, + mesa_glu, + libXcursor, + libXext, + libXrandr, + libXft, + cups, }: stdenv.mkDerivation rec { @@ -23,9 +24,22 @@ stdenv.mkDerivation rec { sha256 = "sha256-bu+IEqNkv9OAf96dPYre3CP759pjalVIbYyc3QSQW2w="; }; - buildInputs = [ libpng libjpeg libtiff zlib bzip2 mesa_glu libXcursor libXext libXrandr libXft ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - cups - ]; + buildInputs = + [ + libpng + libjpeg + libtiff + zlib + bzip2 + mesa_glu + libXcursor + libXext + libXrandr + libXft + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + cups + ]; doCheck = true;