From f90ddc99f6baf59a5dabb11cfd572806ad1274b1 Mon Sep 17 00:00:00 2001 From: Luke Adams Date: Fri, 14 Jul 2017 18:10:38 -0500 Subject: [PATCH] qwt6_qt4: Fix darwin build by adding AGL input --- pkgs/development/libraries/qwt/6_qt4.nix | 7 +++++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/qwt/6_qt4.nix b/pkgs/development/libraries/qwt/6_qt4.nix index 84b71ef4dd7..6f722c59920 100644 --- a/pkgs/development/libraries/qwt/6_qt4.nix +++ b/pkgs/development/libraries/qwt/6_qt4.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, qt4, qmake4Hook }: +{ stdenv, fetchurl, qt4, qmake4Hook, AGL }: stdenv.mkDerivation rec { name = "qwt-6.1.3"; @@ -8,7 +8,10 @@ stdenv.mkDerivation rec { sha256 = "0cwp63s03dw351xavb3pzbjlqvx7kj88wv7v4a2b18m9f97d7v7k"; }; - buildInputs = [ qt4 ]; + buildInputs = [ + qt4 + ] ++ stdenv.lib.optionals stdenv.isDarwin [ AGL ]; + nativeBuildInputs = [ qmake4Hook ]; postPatch = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 793f3889c7f..53b0e1b135c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10507,7 +10507,9 @@ with pkgs; qwt = callPackage ../development/libraries/qwt {}; - qwt6_qt4 = callPackage ../development/libraries/qwt/6_qt4.nix { }; + qwt6_qt4 = callPackage ../development/libraries/qwt/6_qt4.nix { + inherit (darwin.apple_sdk.frameworks) AGL; + }; qxt = callPackage ../development/libraries/qxt {};