From 05be2516c649c792c6e6812cfbf13360c51ed557 Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Sun, 3 Dec 2023 10:35:51 +0800 Subject: [PATCH] Revert "vivado: fix ncurses" Doesn't evaluate. This reverts commit 02ffc97089644951882ac3d9723037b1ef4abfee. --- artiq-fast/vivado.nix | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/artiq-fast/vivado.nix b/artiq-fast/vivado.nix index bef83d0..f6e5f41 100644 --- a/artiq-fast/vivado.nix +++ b/artiq-fast/vivado.nix @@ -6,15 +6,8 @@ pkgs.buildFHSUserEnv { name = "vivado"; targetPkgs = pkgs: ( - with pkgs; let - # Apply patch from https://github.com/nix-community/nix-environments/pull/54 - # to fix ncurses libtinfo.so's soname issue - ncurses' = ncurses5.overrideAttrs (old: { - configureFlags = old.configureFlags ++ [ "--with-termlib" ]; - postFixup = ""; - }); - in [ - (ncurses'.override { unicodeSupport = false; }) + with pkgs; [ + ncurses5 zlib libuuid xorg.libSM