From b7b4b64a98b6a38f15b3434954812e51620a1607 Mon Sep 17 00:00:00 2001 From: Patrick Date: Mon, 19 Aug 2024 16:58:21 +0200 Subject: [PATCH] fix: streamcontroller needs its own nixpkgs --- hosts/desktopnix/default.nix | 15 +++++++-------- pkgs/default.nix | 21 +++++++++------------ 2 files changed, 16 insertions(+), 20 deletions(-) diff --git a/hosts/desktopnix/default.nix b/hosts/desktopnix/default.nix index 4079e7b..e55f2ff 100644 --- a/hosts/desktopnix/default.nix +++ b/hosts/desktopnix/default.nix @@ -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 ]; } diff --git a/pkgs/default.nix b/pkgs/default.nix index 78c7d85..e124915 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -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" + # { }; + # }) + #]; }) ]