wrapQtAppsHook: Remove ad hoc Qt wrappers
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchFromGitHub, cmake, makeWrapper
|
||||
{ stdenv, fetchFromGitHub, cmake
|
||||
, boost, python3, eigen
|
||||
, icestorm, trellis
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
# laptop (and over a remote X server on my server...), so mark it broken for
|
||||
# now, with intent to fix later.
|
||||
, enableGui ? false
|
||||
, qtbase
|
||||
, qtbase, wrapQtAppsHook
|
||||
}:
|
||||
|
||||
let
|
||||
@@ -36,7 +36,9 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "1y14jpa948cwk0i19bsfqh7yxsxkgskm4xym4z179sjcvcdvrn3a";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake makeWrapper ];
|
||||
nativeBuildInputs
|
||||
= [ cmake ]
|
||||
++ (stdenv.lib.optional enableGui wrapQtAppsHook);
|
||||
buildInputs
|
||||
= [ boostPython python3 eigen ]
|
||||
++ (stdenv.lib.optional enableGui qtbase);
|
||||
@@ -56,13 +58,6 @@ stdenv.mkDerivation rec {
|
||||
--replace 'git log -1 --format=%h' 'echo ${substring 0 11 src.rev}'
|
||||
'';
|
||||
|
||||
postInstall = stdenv.lib.optionalString enableGui ''
|
||||
for x in generic ice40 ecp5; do
|
||||
wrapProgram $out/bin/nextpnr-$x \
|
||||
--prefix QT_PLUGIN_PATH : "${qtbase}/${qtbase.qtPluginPrefix}"
|
||||
done
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Place and route tool for FPGAs";
|
||||
homepage = https://github.com/yosyshq/nextpnr;
|
||||
|
||||
Reference in New Issue
Block a user