aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Nipper <nipsy@bitgnome.net>2026-02-16 08:57:28 -0800
committerMark Nipper <nipsy@bitgnome.net>2026-02-16 08:57:28 -0800
commit9980f050f4b4f2c4f00123ce93fda7119dec01b9 (patch)
treec55bcd8649e0bc3a0326dc59382bf37d9b8b4a5f
parente1732fb49ba40f1d4a9465aba9669d07a0c9ce57 (diff)
downloadnix-9980f050f4b4f2c4f00123ce93fda7119dec01b9.tar
nix-9980f050f4b4f2c4f00123ce93fda7119dec01b9.tar.gz
nix-9980f050f4b4f2c4f00123ce93fda7119dec01b9.tar.bz2
nix-9980f050f4b4f2c4f00123ce93fda7119dec01b9.tar.lz
nix-9980f050f4b4f2c4f00123ce93fda7119dec01b9.tar.xz
nix-9980f050f4b4f2c4f00123ce93fda7119dec01b9.tar.zst
nix-9980f050f4b4f2c4f00123ce93fda7119dec01b9.zip
Add yabridge from PR 490633
-rw-r--r--flake.nix20
-rw-r--r--hosts/caladan/default.nix2
-rw-r--r--overlays/default.nix12
3 files changed, 17 insertions, 17 deletions
diff --git a/flake.nix b/flake.nix
index 6deefea..c3b8b5f 100644
--- a/flake.nix
+++ b/flake.nix
@@ -31,7 +31,7 @@
# per https://nixos-and-flakes.thiscute.world/nixos-with-flakes/downgrade-or-upgrade-packages
#nixpkgs-67e692392.url = "github:nixos/nixpkgs/67e69239226f37168d1adb8d29bd61150756a03e";
- #nixpkgs-pr476197.url = "github:Moraxyc/nixpkgs/fix-netcat-openbsd-gcc15";
+ nixpkgs-pr490633.url = "github:M0streng0/nixpkgs/yabridge-disable-bitbridge";
#nixpkgs-wine9_22.url = "github:nixos/nixpkgs/dea5930f0ed8c29d3758d5ade9898b4e99d80b74";
nvidia-patch = {
@@ -52,7 +52,7 @@
home-manager,
nixos-hardware,
nixpkgs-master,
- #nixpkgs-pr476197,
+ nixpkgs-pr490633,
nixpkgs-stable,
#nixpkgs-wine9_22,
nixpkgs,
@@ -96,14 +96,14 @@
caladan = nixpkgs.lib.nixosSystem {
specialArgs = { inherit inputs outputs; };
modules = [
- #({ config, pkgs, ... }:
- # let
- # overlay-netcat-openbsd-pr476197 = final: prev: {
- # netcat-openbsd = nixpkgs-pr476197.legacyPackages."x86_64-linux".netcat-openbsd;
- # };
- # in {
- # nixpkgs.overlays = [ overlay-netcat-openbsd-pr476197 ];
- #})
+ ({ config, pkgs, ... }:
+ let
+ overlay-yabridge-pr490633 = final: prev: {
+ yabridge = nixpkgs-pr490633.legacyPackages."x86_64-linux".yabridge;
+ };
+ in {
+ nixpkgs.overlays = [ overlay-yabridge-pr490633 ];
+ })
disko.nixosModules.disko
./hosts/caladan
home-manager.nixosModules.home-manager {
diff --git a/hosts/caladan/default.nix b/hosts/caladan/default.nix
index 1c8af52..f836a70 100644
--- a/hosts/caladan/default.nix
+++ b/hosts/caladan/default.nix
@@ -139,7 +139,7 @@
outputs.overlays.additions
outputs.overlays.modifications
outputs.overlays.master-packages
- #outputs.overlays.pr476197-packages
+ outputs.overlays.pr490633-packages
outputs.overlays.stable-packages
#outputs.overlays.wine9_22-packages
];
diff --git a/overlays/default.nix b/overlays/default.nix
index d41a286..e620799 100644
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -83,12 +83,12 @@
};
};
- #pr476197-packages = final: _prev: {
- # pr476197 = import inputs.nixpkgs-pr476197 {
- # inherit (final) system;
- # config.allowUnfree = true;
- # };
- #};
+ pr490633-packages = final: _prev: {
+ pr490633 = import inputs.nixpkgs-pr490633 {
+ inherit (final) system;
+ config.allowUnfree = true;
+ };
+ };
# When applied, the stable nixpkgs set (declared in the flake inputs) will
# be accessible through 'pkgs.stable'