From bc3a9b43d7a6b80c02abba1c66056de3b951ed6c Mon Sep 17 00:00:00 2001
From: Oliver Davies <oliver@oliverdavies.dev>
Date: Sat, 16 Nov 2024 15:23:10 +0000
Subject: [PATCH] Revert zoom-us back to nixpkgs-2405
Fixes a black screen when screen sharing.
---
flake.lock | 17 +++++++++++++++++
flake.nix | 3 ++-
home/opdavies/default.nix | 3 ++-
lib/nixos/configuration.nix | 1 +
overlays/default.nix | 7 +++++++
5 files changed, 29 insertions(+), 2 deletions(-)
diff --git a/flake.lock b/flake.lock
index 3be38bd5..1942ee43 100644
--- a/flake.lock
+++ b/flake.lock
@@ -53,6 +53,22 @@
"type": "github"
}
},
+ "nixpkgs-2405": {
+ "locked": {
+ "lastModified": 1731652201,
+ "narHash": "sha256-XUO0JKP1hlww0d7mm3kpmIr4hhtR4zicg5Wwes9cPMg=",
+ "owner": "nixos",
+ "repo": "nixpkgs",
+ "rev": "c21b77913ea840f8bcf9adf4c41cecc2abffd38d",
+ "type": "github"
+ },
+ "original": {
+ "owner": "nixos",
+ "ref": "nixos-24.05",
+ "repo": "nixpkgs",
+ "type": "github"
+ }
+ },
"nixpkgs-unstable": {
"locked": {
"lastModified": 1729665710,
@@ -74,6 +90,7 @@
"home-manager": "home-manager",
"nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs",
+ "nixpkgs-2405": "nixpkgs-2405",
"nixpkgs-unstable": "nixpkgs-unstable"
}
}
diff --git a/flake.nix b/flake.nix
index aa34b530..898b9a9f 100644
--- a/flake.nix
+++ b/flake.nix
@@ -7,11 +7,12 @@
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
+
+ nixpkgs-2405.url = "github:nixos/nixpkgs/nixos-24.05";
};
outputs =
{
- home-manager,
nixos-hardware,
nixpkgs,
self,
diff --git a/home/opdavies/default.nix b/home/opdavies/default.nix
index 67eefa1f..a3c3ae6e 100644
--- a/home/opdavies/default.nix
+++ b/home/opdavies/default.nix
@@ -67,7 +67,8 @@ in
pocket-casts
xcape
xsel
- zoom-us
+
+ pkgs.nixpkgs-2405.zoom-us
]
);
diff --git a/lib/nixos/configuration.nix b/lib/nixos/configuration.nix
index 0b816711..00871e0f 100644
--- a/lib/nixos/configuration.nix
+++ b/lib/nixos/configuration.nix
@@ -22,6 +22,7 @@ in
overlays = [
outputs.overlays.additions
outputs.overlays.modifications
+ outputs.overlays.stable-packages
outputs.overlays.unstable-packages
];
};
diff --git a/overlays/default.nix b/overlays/default.nix
index a9643c2d..f3fb4e37 100644
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -11,6 +11,13 @@
modifications = final: prev: { };
+ stable-packages = final: _prev: {
+ nixpkgs-2405 = import inputs.nixpkgs-2405 {
+ config.allowUnfree = true;
+ system = final.system;
+ };
+ };
+
unstable-packages = final: _prev: {
unstable = import inputs.nixpkgs-unstable {
config.allowUnfree = true;