~ruther/nixos-config

34dd5ffed63e93cba6d84b8018d96c3f24426993 — Rutherther 1 year, 4 months ago 8c38c30
feat: use stable packages for vivado fhd
M hosts/laptop-iapetus/home.nix => hosts/laptop-iapetus/home.nix +2 -2
@@ 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";
      })
    ];

M modules/programs/fpga/vivado/default.nix => modules/programs/fpga/vivado/default.nix +1 -1
@@ 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

M modules/programs/fpga/vivado/fhs.nix => modules/programs/fpga/vivado/fhs.nix +2 -2
@@ 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; [

M modules/programs/fpga/vivado/home.nix => modules/programs/fpga/vivado/home.nix +3 -3
@@ 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

Do not follow this link