Skip to content

Commit

Permalink
flake.lock: bump revisions + fix build issues
Browse files Browse the repository at this point in the history
Seems that while I was gone Nixpkgs bumped to GCC 14. This has seemingly broken quite a few of the older archive utilities. Patool also broke, though I don't think it's related to GCC 14. The simplest fix was to rollback the stdenv for the broken archive utilities, and to pin a newer version of patool that was merged onto master but isn't yet in unstable. Once it rolls in I will remove the pin.
  • Loading branch information
Frontear committed Jan 2, 2025
1 parent ccacbb4 commit cfbd396
Show file tree
Hide file tree
Showing 2 changed files with 38 additions and 21 deletions.
32 changes: 16 additions & 16 deletions flake.lock

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

27 changes: 22 additions & 5 deletions modules/home-manager/programs/patool/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
lib,
symlinkJoin,
makeWrapper,
gcc13Stdenv,

patool,

Expand Down Expand Up @@ -34,17 +35,33 @@
zpaq,
zstd,
}:
symlinkJoin {
let
stdenv = gcc13Stdenv;

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

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

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

rzip' = rzip.override {
inherit stdenv;
};
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 All @@ -55,7 +72,7 @@ symlinkJoin {
gnutar
gzip
lcab
lha
lha'
lrzip
lz4
lzip
Expand All @@ -64,7 +81,7 @@ symlinkJoin {
ncompress
p7zip
rar
rzip
rzip'
sharutils
unar
xz
Expand Down

0 comments on commit cfbd396

Please sign in to comment.