patrick/nix-config
1
1
Fork 0
Code Issues Pull requests Projects Wiki Activity

fix: streamcontroller needs its own nixpkgs

Browse source
This commit is contained in:
Patrick 2024-08-19 16:58:21 +02:00
parent 0ebd6d5ec9
commit b7b4b64a98
Signed by: patrick
GPG key ID: 451F95EFB8BECD0F
2 changed files with 16 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
hosts/desktopnix/default.nix
View file

@ -1,9 +1,8 @@
{
inputs,
lib,
pkgs,
...
}:
{ inputs, lib, ... }:
let
nixp = import inputs.nixpkgs-streamcontroller { system = "x86_64-linux"; };
inherit (nixp) streamcontroller;
in
{
imports = [
inputs.nixos-hardware.nixosModules.common-gpu-nvidia-nonprime
@ -79,6 +78,6 @@
nixpkgs.config.cudaSupport = true;
environment.systemPackages = [ pkgs.streamlink ];
services.udev.packages = [ pkgs.streamlink ];
environment.systemPackages = [ streamcontroller ];
services.udev.packages = [ streamcontroller ];
}

21
pkgs/default.nix
View file

@ -1,4 +1,4 @@
inputs: [
_inputs: [
(import ./scripts)
(_final: prev: {
zsh-histdb-skim = prev.callPackage ./zsh-histdb-skim.nix { };
@ -10,9 +10,6 @@ inputs: [
minion = prev.callPackage ./minion.nix { };
mongodb-bin = prev.callPackage ./mongodb-bin.nix { };
awakened-poe-trade = prev.callPackage ./awakened-poe-trade.nix { };
streamcontroller =
prev.callPackage "${inputs.nixpgkgs-streamcontroller}/pkgs/by-name/st/streamcontroller/package.nix"
{ };
neovim-clean = prev.neovim-unwrapped.overrideAttrs (
_neovimFinal: neovimPrev: {
nativeBuildInputs = (neovimPrev.nativeBuildInputs or [ ]) ++ [ prev.makeWrapper ];
@ -51,13 +48,13 @@ inputs: [
}
);
kanidm-provision = prev.callPackage ./kanidm-provision.nix { };
pythonPackagesExtension = prev.pythonPackagesExtension ++ [
(_pythonFinal: pythonPrev: {
usb-monitor =
pythonPrev.callPackage
"${inputs.nixpkgs-streamcontroller}/pkgs/development/python-modules/usb-monitor/default.nix"
{ };
})
];
#pythonPackagesExtension = prev.pythonPackagesExtension ++ [
# (_pythonFinal: pythonPrev: {
# usb-monitor =
# pythonPrev.callPackage
# "${inputs.nixkgs-streamcontroller}/pkgs/development/python-modules/usb-monitor/default.nix"
# { };
# })
#];
})
]