colin/nix-files
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

nixpkgs-bootstrap: 0-unstable-2024-11-23 -> 0-unstable-2024-11-25

Browse Source
This commit is contained in:
Colin
2024-11-26 07:03:58 +00:00
parent ff97457545
commit f653906c37
4 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
hosts/common/programs/element-desktop.nix
View File

@@ -7,10 +7,11 @@
{ lib, pkgs, ... }: { lib, pkgs, ... }:
{ {
sane.programs.element-desktop = { sane.programs.element-desktop = {
packageUnwrapped = (pkgs.element-desktop.override { # packageUnwrapped = (pkgs.element-desktop.override {
# use pre-built electron because otherwise it takes 4 hrs to build from source. # # use pre-built electron because otherwise it takes 4 hrs to build from source.
electron = pkgs.electron-bin; # electron = pkgs.electron-bin;
}).overrideAttrs (upstream: { # }).overrideAttrs (upstream: {
packageUnwrapped = pkgs.element-desktop.overrideAttrs (upstream: {
# fix to use wayland instead of Xwayland: # fix to use wayland instead of Xwayland:
# - replace `NIXOS_OZONE_WL` non-empty check with `WAYLAND_DISPLAY` # - replace `NIXOS_OZONE_WL` non-empty check with `WAYLAND_DISPLAY`
# - use `wayland` instead of `auto` because --ozone-platform-hint=auto still prefers X over wayland when both are available # - use `wayland` instead of `auto` because --ozone-platform-hint=auto still prefers X over wayland when both are available

6
pkgs/by-name/nixpkgs-bootstrap/master.nix
View File

@@ -2,8 +2,8 @@
mkNixpkgs ? import ./mkNixpkgs.nix {} mkNixpkgs ? import ./mkNixpkgs.nix {}
}: }:
mkNixpkgs { mkNixpkgs {
rev = "975e7e7c20bee89f9cf14a0b26401cb93fe36381"; rev = "1942e92ea40b1adf4ff399ebe87b37a2121facf0";
sha256 = "sha256-IeiNrCafLCGjz2+2SY8sjhdyljSu62YCKmhvzwOYUuk="; sha256 = "sha256-wwN9Ucg6KaW9GVGOd91TUB9YFqK6Jh5CCSxS9GveJus=";
version = "0-unstable-2024-11-23"; version = "0-unstable-2024-11-25";
branch = "master"; branch = "master";
} }

6
pkgs/by-name/nixpkgs-bootstrap/staging-next.nix
View File

@@ -2,8 +2,8 @@
mkNixpkgs ? import ./mkNixpkgs.nix {} mkNixpkgs ? import ./mkNixpkgs.nix {}
}: }:
mkNixpkgs { mkNixpkgs {
rev = "41845d16d3aa27afe3e0e73b395179ed22749d3d"; rev = "d33a22199933acfc5fff998eb262883a9fb74090";
sha256 = "sha256-wA+2DufkEtcsPyCbi51u6hQraYWr8v4W4W46u993gwk="; sha256 = "sha256-EtYRmMcep4cTKGnfiq2toWdulEr7180p6XyYFlvqWeQ=";
version = "0-unstable-2024-11-23"; version = "0-unstable-2024-11-25";
branch = "staging-next"; branch = "staging-next";
} }

6
pkgs/by-name/nixpkgs-bootstrap/staging.nix
View File

@@ -2,8 +2,8 @@
mkNixpkgs ? import ./mkNixpkgs.nix {} mkNixpkgs ? import ./mkNixpkgs.nix {}
}: }:
mkNixpkgs { mkNixpkgs {
rev = "b4ffcdd28a91b6b7bececfc515aabe44b967454a"; rev = "4f8a186b2b9dc4fa07fc2e77519732fddcdc7502";
sha256 = "sha256-KkEi9stQ3R+FNTD2w1QMUrt7JWTkyD6AxzbfcfPx8vE="; sha256 = "sha256-aRGyfGEyl1wHlEhe+HRKKVh0E8PDqF7/djEksK1hlsY=";
version = "0-unstable-2024-11-24"; version = "0-unstable-2024-11-25";
branch = "staging"; branch = "staging";
} }