From b310053c012f92c8742d88ffc37bb446a4ecdc87 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Sun, 10 Sep 2017 17:05:01 +0200
Subject: [PATCH] fox-1.6: add missing frameworks
---
pkgs/development/libraries/fox/fox-1.6.nix | 9 ++++++---
pkgs/top-level/all-packages.nix | 4 +++-
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/pkgs/development/libraries/fox/fox-1.6.nix b/pkgs/development/libraries/fox/fox-1.6.nix
index 98becb8e2da..63ec6233616 100644
--- a/pkgs/development/libraries/fox/fox-1.6.nix
+++ b/pkgs/development/libraries/fox/fox-1.6.nix
@@ -1,5 +1,6 @@
{ stdenv, fetchurl, xlibsWrapper, libpng, libjpeg, libtiff, zlib, bzip2, libXcursor
-, libXrandr, mesa, libXft, libXfixes, xinput }:
+, libXrandr, mesa, libXft, libXfixes, xinput
+, CoreServices }:
let
version = "1.6.49";
@@ -13,8 +14,10 @@ stdenv.mkDerivation rec {
sha256 = "03m9wm8hpzh1i0fxx5mpvjr67384pfm9hn7gzdcq55b4639fqy9n";
};
- buildInputs = [ xlibsWrapper libpng libjpeg libtiff zlib bzip2 libXcursor libXrandr
- libXft mesa libXfixes xinput ];
+ buildInputs = [
+ xlibsWrapper libpng libjpeg libtiff zlib bzip2 libXcursor libXrandr
+ libXft mesa libXfixes xinput
+ ] ++ stdenv.lib.optional stdenv.isDarwin CoreServices;
doCheck = true;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8b0cb6e77cd..72902fc2b31 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2048,7 +2048,9 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) CoreServices;
};
- fox_1_6 = callPackage ../development/libraries/fox/fox-1.6.nix { };
+ fox_1_6 = callPackage ../development/libraries/fox/fox-1.6.nix {
+ inherit (darwin.apple_sdk.frameworks) CoreServices;
+ };
fping = callPackage ../tools/networking/fping {};