diff options
Diffstat (limited to 'nixpkgs/pkgs/development/embedded/fpga/trellis/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/development/embedded/fpga/trellis/default.nix | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/nixpkgs/pkgs/development/embedded/fpga/trellis/default.nix b/nixpkgs/pkgs/development/embedded/fpga/trellis/default.nix index 8c44e34e3ed1..32a4bcdac073 100644 --- a/nixpkgs/pkgs/development/embedded/fpga/trellis/default.nix +++ b/nixpkgs/pkgs/development/embedded/fpga/trellis/default.nix @@ -1,25 +1,28 @@ { lib, stdenv, fetchFromGitHub, python3, boost, cmake }: let - rev = "03e0070f263fbe31c247de61d259544722786210"; + rev = "2f06397673bbca3da11928d538b8ab7d01c944c6"; # git describe --tags - realVersion = "1.0-532-g${builtins.substring 0 7 rev}"; + realVersion = "1.0-534-g${builtins.substring 0 7 rev}"; in stdenv.mkDerivation rec { pname = "trellis"; - version = "2021-09-01"; + version = "2021-12-14"; srcs = [ (fetchFromGitHub { owner = "YosysHQ"; repo = "prjtrellis"; inherit rev; - sha256 = "joQMsjVj8d3M3IaqOkfVQ1I5qPDM8HHJiye+Ak8f3dg="; + hash = "sha256-m5CalAIbzY2bhOvpBbPBeLZeDp+itk1HlRsSmtiddaA="; name = "trellis"; }) (fetchFromGitHub { owner = "YosysHQ"; repo = "prjtrellis-db"; + # note: the upstream submodule points to revision 0ee729d20eaf, + # but that's just the tip of the branch that was merged into master. + # fdf4bf275a is the merge commit itself rev = "fdf4bf275a7402654bc643db537173e2fbc86103"; sha256 = "eDq2wU2pnfK9bOkEVZ07NQPv02Dc6iB+p5GTtVBiyQA="; name = "trellis-database"; @@ -41,6 +44,12 @@ in stdenv.mkDerivation rec { cd libtrellis ''; + postInstall = lib.optionalString stdenv.isDarwin '' + for f in $out/bin/* ; do + install_name_tool -change "$out/lib/libtrellis.dylib" "$out/lib/trellis/libtrellis.dylib" "$f" + done + ''; + doInstallCheck = true; installCheckPhase = '' |