From 34dd5ffed63e93cba6d84b8018d96c3f24426993 Mon Sep 17 00:00:00 2001 From: Rutherther Date: Wed, 15 Nov 2023 20:37:56 +0100 Subject: [PATCH] feat: use stable packages for vivado fhd --- hosts/laptop-iapetus/home.nix | 4 ++-- modules/programs/fpga/vivado/default.nix | 2 +- modules/programs/fpga/vivado/fhs.nix | 4 ++-- modules/programs/fpga/vivado/home.nix | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/hosts/laptop-iapetus/home.nix b/hosts/laptop-iapetus/home.nix index 44c037d..472e0cb 100644 --- a/hosts/laptop-iapetus/home.nix +++ b/hosts/laptop-iapetus/home.nix @@ -11,14 +11,14 @@ # └─ home.nix # -{ pkgs, lib, config, ... }: +{ pkgs, lib, config, stable, ... }: { imports = [ ../../modules/desktop/qtile/home.nix # Window Manager (import ../../modules/programs/fpga/vivado/home.nix { - inherit pkgs lib config; + inherit pkgs lib config stable; vivadoPath = "/data/fpga/xilinx/Vivado/2023.1/bin/vivado"; }) ]; diff --git a/modules/programs/fpga/vivado/default.nix b/modules/programs/fpga/vivado/default.nix index 5b86cfe..cd779f1 100644 --- a/modules/programs/fpga/vivado/default.nix +++ b/modules/programs/fpga/vivado/default.nix @@ -1,7 +1,7 @@ { config, lib, pkgs, vivadoPath, ... }: let - vivadoPkg = pkgs.callPackage ./vivado-pkg.nix { }; + vivadoPkg = pkgs.callPackage ./vivado-pkg.nix { }; in { services.udev.packages = [ vivadoPkg diff --git a/modules/programs/fpga/vivado/fhs.nix b/modules/programs/fpga/vivado/fhs.nix index bb8a620..e183eb8 100644 --- a/modules/programs/fpga/vivado/fhs.nix +++ b/modules/programs/fpga/vivado/fhs.nix @@ -1,6 +1,6 @@ -{ stdenv, config, lib, pkgs, vivadoPath, ... }: +{ stdenv, config, lib, stable, pkgs, vivadoPath, ... }: -pkgs.buildFHSEnv { +stable.buildFHSEnv { name = "vivado-wrapped"; targetPkgs = pkgs: with pkgs; [ diff --git a/modules/programs/fpga/vivado/home.nix b/modules/programs/fpga/vivado/home.nix index b5863dd..2ab2ced 100644 --- a/modules/programs/fpga/vivado/home.nix +++ b/modules/programs/fpga/vivado/home.nix @@ -1,8 +1,8 @@ -{ config, lib, pkgs, vivadoPath, ... }: +{ config, lib, pkgs, vivadoPath, stable, ... }: let - vivadoPkg = pkgs.callPackage ./vivado-pkg.nix { inherit vivadoPath; }; - fhsPkg = pkgs.callPackage ./fhs.nix { inherit vivadoPath; }; + vivadoPkg = pkgs.callPackage ./vivado-pkg.nix { inherit vivadoPath stable; }; + fhsPkg = pkgs.callPackage ./fhs.nix { inherit vivadoPath stable; }; in { home.packages = [ fhsPkg -- 2.48.1