From 2fe7e66ca091f5d3e7cef55ac4d8354ac13c5062 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonathan=20Neusch=C3=A4fer?= Date: Fri, 17 Feb 2023 19:11:58 +0100 Subject: [PATCH] lattice-diamond: Replace direct use of /usr/bin/id with Nix-compatible path --- pkgs/development/embedded/fpga/lattice-diamond/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/embedded/fpga/lattice-diamond/default.nix b/pkgs/development/embedded/fpga/lattice-diamond/default.nix index 4bd62bfa929..f80261720cf 100644 --- a/pkgs/development/embedded/fpga/lattice-diamond/default.nix +++ b/pkgs/development/embedded/fpga/lattice-diamond/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, rpmextract, patchelf, makeWrapper, file, requireFile, glib, zlib, - freetype, fontconfig, xorg, libusb-compat-0_1 }: + freetype, fontconfig, xorg, libusb-compat-0_1, coreutils }: stdenv.mkDerivation { pname = "diamond"; @@ -85,6 +85,9 @@ stdenv.mkDerivation { done done + # Patch absolute /usr/bin/id path in script + sed -i -e "s#/usr/bin/id#${coreutils}/bin/id#" $out/$prefix/synpbase/bin/config/platform_set + # Remove 32-bit libz. rm $out/$prefix/bin/lin64/libz.{so,so.1}