public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nextpnr: (hopefully) fix build on Darwin

Browse Source 
Fixes #67898, hopefully.
This commit is contained in:
Emily 2019-09-02 18:49:12 +01:00 committed by Austin Seipp
parent d13e64641d
commit 12ae04518b
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/compilers/nextpnr/default.nix
View File

@ -6,6 +6,7 @@
, enableGui ? true , enableGui ? true
, wrapQtAppsHook , wrapQtAppsHook
, qtbase , qtbase
, OpenGL ? null
}: }:
let let
@ -41,7 +42,10 @@ with stdenv; mkDerivation rec {
"-DSERIALIZE_CHIPDB=OFF" "-DSERIALIZE_CHIPDB=OFF"
# use PyPy for icestorm if enabled # use PyPy for icestorm if enabled
"-DPYTHON_EXECUTABLE=${icestorm.pythonInterp}" "-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 # Fix the version number. This is a bit stupid (and fragile) in practice
# but works ok. We should probably make this overrideable upstream. # 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"; description = "Place and route tool for FPGAs";
homepage = https://github.com/yosyshq/nextpnr; homepage = https://github.com/yosyshq/nextpnr;
license = licenses.isc; license = licenses.isc;
platforms = platforms.linux; platforms = platforms.all;
maintainers = with maintainers; [ thoughtpolice emily ]; maintainers = with maintainers; [ thoughtpolice emily ];
}; };
} }

4
pkgs/top-level/all-packages.nix
View File

@ -8265,7 +8265,9 @@ in
neko = callPackage ../development/compilers/neko { }; 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 { }; nasm = callPackage ../development/compilers/nasm { };