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

nixpkgs: 2023-11-26 -> 2023-11-26

Browse Source 
```
• Updated input 'nixpkgs-unpatched':
    'github:nixos/nixpkgs/c6c20c63b4c1f715f602ecc46e21521e7825c2fb' (2023-11-26)
  → 'github:nixos/nixpkgs/013f0a99e56eeb1cfb44764fc0d419306b84bbe4' (2023-11-26)
```
This commit is contained in:
Colin 2023-11-26 21:55:32 +00:00
parent f8db994129
commit 3ebf6470c1
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
flake.lock
View File

@ -53,11 +53,11 @@
},
"nixpkgs-unpatched": {
"locked": {
"lastModified": 1700998929,
"narHash": "sha256-Ajkz8t8MTCeAlvzEMTyPKrkLfnKQuLAXhMQTWxExqpw=",
"lastModified": 1701035596,
"narHash": "sha256-oZ8zdVQDRGhQ3+1H8rzqwMqxCS1MPJ9T265CuwHB8eI=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "c6c20c63b4c1f715f602ecc46e21521e7825c2fb",
"rev": "013f0a99e56eeb1cfb44764fc0d419306b84bbe4",
"type": "github"
},
"original": {

5
hosts/modules/gui/sway/default.nix
View File

@ -14,16 +14,15 @@ let
echo "launching sway-session (sway.desktop)..." | ${systemd-cat} --identifier=sway-session
sway 2>&1 | ${systemd-cat} --identifier=sway-session
'';
origSway = (pkgs.wrapSway.override {
origSway = pkgs.sway.override {
# this override is what `programs.nixos` would do internally if we left `package` unset.
# NOTE(2023/11/26): this wrapper is in flux, see: <https://github.com/NixOS/nixpkgs/pull/270013>
extraSessionCommands = scfg.extraSessionCommands;
extraOptions = scfg.extraOptions;
withBaseWrapper = scfg.wrapperFeatures.base;
withGtkWrapper = scfg.wrapperFeatures.gtk;
isNixOS = true;
# TODO: `enableXWayland = ...`?
}) pkgs.sway-unwrapped;
};
desktop-file = pkgs.runCommand "sway-desktop-wrapper" {} ''
mkdir -p $out/share/wayland-sessions
substitute ${origSway}/share/wayland-sessions/sway.desktop $out/share/wayland-sessions/sway.desktop \