From 894644c8e8f4e810a6adf450273c3bfb8f223cfa Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 4 Jun 2019 22:23:05 -0400 Subject: [PATCH] mesa-glu: add macOS frameworks - glu needs ApplicationServices --- pkgs/development/libraries/mesa-glu/default.nix | 5 +++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/mesa-glu/default.nix b/pkgs/development/libraries/mesa-glu/default.nix index cb238a6a5ae..94622b8a8f9 100644 --- a/pkgs/development/libraries/mesa-glu/default.nix +++ b/pkgs/development/libraries/mesa-glu/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libGL }: +{ stdenv, fetchurl, pkgconfig, libGL, ApplicationServices }: stdenv.mkDerivation rec { name = "glu-${version}"; @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ pkgconfig ]; - propagatedBuildInputs = [ libGL ]; + propagatedBuildInputs = [ libGL ] + ++ stdenv.lib.optional stdenv.isDarwin ApplicationServices; outputs = [ "out" "dev" ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a714e34371b..7cfea7dacc9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12209,7 +12209,9 @@ in }; mesa = mesa_noglu; - mesa_glu = callPackage ../development/libraries/mesa-glu { }; + mesa_glu = callPackage ../development/libraries/mesa-glu { + inherit (darwin.apple_sdk.frameworks) ApplicationServices; + }; # NOTE: 2018-07-12: legacy alias: # gcsecurity bussiness is done: https://www.theregister.co.uk/2018/02/08/bruce_perens_grsecurity_anti_slapp/