diff options
| author | Alyssa Ross <hi@alyssa.is> | 2019-09-08 00:46:04 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2019-09-16 22:13:21 +0000 |
| commit | afcf2d55332c5c01c2d989e9d010577d257cb6cc (patch) | |
| tree | e1c816a271686b014a6403bcad7c57dd2ee4d9c7 /nixpkgs/pkgs/development/compilers/nextpnr/default.nix | |
| parent | 175b9acd282aaf65b5f354ea6e95c1348fe3daa3 (diff) | |
| parent | 4e60699fa727e4a0f9a3e78948012f86da32cfef (diff) | |
| download | nixlib-afcf2d55332c5c01c2d989e9d010577d257cb6cc.tar nixlib-afcf2d55332c5c01c2d989e9d010577d257cb6cc.tar.gz nixlib-afcf2d55332c5c01c2d989e9d010577d257cb6cc.tar.bz2 nixlib-afcf2d55332c5c01c2d989e9d010577d257cb6cc.tar.lz nixlib-afcf2d55332c5c01c2d989e9d010577d257cb6cc.tar.xz nixlib-afcf2d55332c5c01c2d989e9d010577d257cb6cc.tar.zst nixlib-afcf2d55332c5c01c2d989e9d010577d257cb6cc.zip | |
Merge commit '4e60699fa727e4a0f9a3e78948012f86da32cfef'
Diffstat (limited to 'nixpkgs/pkgs/development/compilers/nextpnr/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/development/compilers/nextpnr/default.nix | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/nixpkgs/pkgs/development/compilers/nextpnr/default.nix b/nixpkgs/pkgs/development/compilers/nextpnr/default.nix index c1e01ef77828..894ef8c45fa0 100644 --- a/nixpkgs/pkgs/development/compilers/nextpnr/default.nix +++ b/nixpkgs/pkgs/development/compilers/nextpnr/default.nix @@ -1,6 +1,7 @@ { stdenv, fetchFromGitHub, cmake , boost, python3, eigen , icestorm, trellis +, llvmPackages , enableGui ? true , wrapQtAppsHook @@ -12,13 +13,13 @@ let in with stdenv; mkDerivation rec { pname = "nextpnr"; - version = "2019.08.21"; + version = "2019.08.31"; src = fetchFromGitHub { owner = "yosyshq"; repo = "nextpnr"; - rev = "c192ba261d77ad7f0a744fb90b01e4a5b63938c4"; - sha256 = "0g2ar1z89b31qw5vgqj2rrcv9rzncs94184dgcsrz19p866654mf"; + rev = "c0b7379e8672b6263152d5e340e62f22179fdc8b"; + sha256 = "174n962xiwyzy53cn192h9rq95h951k3xy6bs43p5ya592ai5mjh"; }; nativeBuildInputs @@ -26,7 +27,8 @@ with stdenv; mkDerivation rec { ++ (lib.optional enableGui wrapQtAppsHook); buildInputs = [ boostPython python3 eigen ] - ++ (lib.optional enableGui qtbase); + ++ (lib.optional enableGui qtbase) + ++ (lib.optional stdenv.cc.isClang llvmPackages.openmp); enableParallelBuilding = true; cmakeFlags = @@ -59,7 +61,7 @@ with stdenv; mkDerivation rec { description = "Place and route tool for FPGAs"; homepage = https://github.com/yosyshq/nextpnr; license = licenses.isc; - platforms = platforms.all; + platforms = platforms.linux; maintainers = with maintainers; [ thoughtpolice emily ]; }; } |