Skip to content

Commit

Permalink
flake.lock: bump revisions
Browse files Browse the repository at this point in the history
Some `patool` related fixes landed, including build failures for 2 of the derivations I use, so we have reverted those. Furthermore, pulseaudio related module options got moved from `hardware.pulseaudio` to `services.pulseaudio`.
  • Loading branch information
Frontear committed Jan 8, 2025
1 parent 6844093 commit 1c52060
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 21 deletions.
24 changes: 12 additions & 12 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 2 additions & 8 deletions modules/home-manager/programs/patool/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,6 @@
let
stdenv = gcc13Stdenv;

patool' = (builtins.getFlake "github:NixOS/nixpkgs/7fa1a3c6b3d22f5e53bb765518a749847a25bb65").legacyPackages.${stdenv.system}.patool;

arj' = arj.override {
inherit stdenv;
};

lha' = lha.override {
inherit stdenv;
};
Expand All @@ -53,15 +47,15 @@ let
};
in symlinkJoin {
name = "patool";
paths = [ patool' ];
paths = [ patool ];

nativeBuildInputs = [ makeWrapper ];

postBuild = ''
wrapProgram $out/bin/patool \
--prefix PATH : ${lib.makeBinPath [
archiver
arj'
arj
bintools
bzip2
bzip3
Expand Down
2 changes: 1 addition & 1 deletion modules/nixos/system/audio/pipewire/module.nix
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ in {
config = lib.mkIf cfg.enable (lib.mkMerge [
{
# Kill PulseAudio and ALSA stuff
hardware.pulseaudio.enable = lib.mkForce false;
services.pulseaudio.enable = lib.mkForce false;
hardware.alsa.enablePersistence = false; # https://github.com/NixOS/nixpkgs/issues/330606
}
{
Expand Down

0 comments on commit 1c52060

Please sign in to comment.