From 12ae04518b004adf949a43125954b99c05189e6f Mon Sep 17 00:00:00 2001 From: Emily Date: Mon, 2 Sep 2019 18:49:12 +0100 Subject: [PATCH] nextpnr: (hopefully) fix build on Darwin Fixes #67898, hopefully. --- pkgs/development/compilers/nextpnr/default.nix | 8 ++++++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/nextpnr/default.nix b/pkgs/development/compilers/nextpnr/default.nix index 894ef8c45fa..357f26cf314 100644 --- a/pkgs/development/compilers/nextpnr/default.nix +++ b/pkgs/development/compilers/nextpnr/default.nix @@ -6,6 +6,7 @@ , enableGui ? true , wrapQtAppsHook , qtbase +, OpenGL ? null }: let @@ -41,7 +42,10 @@ with stdenv; mkDerivation rec { "-DSERIALIZE_CHIPDB=OFF" # use PyPy for icestorm if enabled "-DPYTHON_EXECUTABLE=${icestorm.pythonInterp}" - ] ++ (lib.optional (!enableGui) "-DBUILD_GUI=OFF"); + ] + ++ (lib.optional (!enableGui) "-DBUILD_GUI=OFF") + ++ (lib.optional (enableGui && stdenv.isDarwin) + "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks"); # Fix the version number. This is a bit stupid (and fragile) in practice # but works ok. We should probably make this overrideable upstream. @@ -61,7 +65,7 @@ with stdenv; mkDerivation rec { description = "Place and route tool for FPGAs"; homepage = https://github.com/yosyshq/nextpnr; license = licenses.isc; - platforms = platforms.linux; + platforms = platforms.all; maintainers = with maintainers; [ thoughtpolice emily ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6b574576b13..b4a9c68c1fe 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8265,7 +8265,9 @@ in neko = callPackage ../development/compilers/neko { }; - nextpnr = libsForQt5.callPackage ../development/compilers/nextpnr { }; + nextpnr = libsForQt5.callPackage ../development/compilers/nextpnr { + inherit (darwin.apple_sdk.frameworks) OpenGL; + }; nasm = callPackage ../development/compilers/nasm { };