diff --git a/common/pc/chromium.nix b/common/pc/chromium.nix index 1f81b04..6268479 100644 --- a/common/pc/chromium.nix +++ b/common/pc/chromium.nix @@ -17,38 +17,6 @@ let "PREFIX=$(out)" ]; }; - - nvidia-vaapi-driver = pkgs.stdenv.mkDerivation rec { - pname = "nvidia-vaapi-driver"; - version = "0.0.5"; - - src = pkgs.fetchFromGitHub { - owner = "elFarto"; - repo = pname; - rev = "v${version}"; - sha256 = "2bycqKolVoaHK64XYcReteuaON9TjzrFhaG5kty28YY="; - }; - - patches = [ - ./use-meson-v57.patch - ]; - - nativeBuildInputs = with pkgs; [ - meson - cmake - ninja - pkg-config - ]; - - buildInputs = with pkgs; [ - nv-codec-headers-11-1-5-1 - libva - gst_all_1.gstreamer - gst_all_1.gst-plugins-bad - libglvnd - ]; - }; - in { config = lib.mkIf cfg.enable { diff --git a/common/pc/vscodium.nix b/common/pc/vscodium.nix index 2efdad2..6eb8b2d 100644 --- a/common/pc/vscodium.nix +++ b/common/pc/vscodium.nix @@ -15,7 +15,7 @@ let name = "platformio-ide"; publisher = "platformio"; version = "3.1.1"; - sha256 = "fwEct7Tj8bfTOLRozSZJGWoLzWRSvYz/KxcnfpO8Usg="; + sha256 = "g9yTG3DjVUS2w9eHGAai5LoIfEGus+FPhqDnCi4e90Q="; } ]; diff --git a/flake.lock b/flake.lock index be3e63a..b807e53 100644 --- a/flake.lock +++ b/flake.lock @@ -215,18 +215,6 @@ "type": "indirect" } }, - "nixpkgs-hostapd-pr": { - "flake": false, - "locked": { - "narHash": "sha256-35+g1EJMcDFhb3UP15fyR1aD4AX1ifz2EqaYItITZ7U=", - "type": "file", - "url": "https://github.com/NixOS/nixpkgs/pull/222536.patch" - }, - "original": { - "type": "file", - "url": "https://github.com/NixOS/nixpkgs/pull/222536.patch" - } - }, "radio": { "inputs": { "flake-utils": [ @@ -277,7 +265,6 @@ "flake-utils": "flake-utils", "nix-index-database": "nix-index-database", "nixpkgs": "nixpkgs", - "nixpkgs-hostapd-pr": "nixpkgs-hostapd-pr", "radio": "radio", "radio-web": "radio-web", "simple-nixos-mailserver": "simple-nixos-mailserver" diff --git a/flake.nix b/flake.nix index 4fb02b8..fcdb946 100644 --- a/flake.nix +++ b/flake.nix @@ -1,8 +1,6 @@ { inputs = { nixpkgs.url = "github:NixOS/nixpkgs/master"; - # nixpkgs-patch-howdy.url = "https://github.com/NixOS/nixpkgs/pull/216245.diff"; - # nixpkgs-patch-howdy.flake = false; flake-utils.url = "github:numtide/flake-utils"; @@ -39,9 +37,6 @@ # prebuilt nix-index database nix-index-database.url = "github:Mic92/nix-index-database"; nix-index-database.inputs.nixpkgs.follows = "nixpkgs"; - - nixpkgs-hostapd-pr.url = "https://github.com/NixOS/nixpkgs/pull/222536.patch"; - nixpkgs-hostapd-pr.flake = false; }; outputs = { self, nixpkgs, ... }@inputs: @@ -86,7 +81,7 @@ name = "nixpkgs-patched"; src = nixpkgs; patches = [ - inputs.nixpkgs-hostapd-pr + # no patches to nixpkgs at this time ]; }; patchedNixpkgs = nixpkgs.lib.fix (self: (import "${patchedNixpkgsSrc}/flake.nix").outputs { self = nixpkgs; });