Skip to content

Commit c19a615

Browse files
committed
nix: sort overlay contents in alphabetical order, explaining contents
1 parent f08bf22 commit c19a615

File tree

1 file changed

+29
-9
lines changed

1 file changed

+29
-9
lines changed

overlay.nix

Lines changed: 29 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,43 @@ inputs: final: prev:
33
{
44
inherit (final.python3.pkgs) unblob;
55
_sources = final.callPackage ./nix/_sources/generated.nix { };
6-
ubi_reader = final.callPackage ./nix/ubi_reader { };
6+
7+
# Lief 12.3 incompatibility with Cmake 3.26
8+
lief = prev.lief.overrideAttrs (super: {
9+
postPatch = ''
10+
substituteInPlace setup.py \
11+
--replace \
12+
'cmake_args = ["-DLIEF_FORCE_API_EXPORTS=ON", "-DLIEF_PYTHON_API=on"]' \
13+
'cmake_args = ["-DLIEF_FORCE_API_EXPORTS=ON", "-DLIEF_PYTHON_API=on", "-DLIEF_EXAMPLES=off"]'
14+
'';
15+
});
16+
17+
# Own package updated independently of nixpkgs
718
jefferson = final.callPackage ./nix/jefferson { };
19+
820
python3 = prev.python3 // {
921
pkgs = prev.python3.pkgs.overrideScope
1022
(pyFinal: pyPrev: {
23+
# Own package updated independently of nixpkgs
24+
lzallright = pyFinal.callPackage ./nix/lzallright { };
25+
26+
# Own package updated independently of nixpkgs
1127
pyperscan = inputs.pyperscan.packages.${final.system}.default.vectorscan;
12-
unblob-native = inputs.unblob-native.packages.${final.system}.default;
28+
29+
# Missing from nixpkgs
1330
treelib = pyFinal.callPackage ./nix/treelib { };
14-
lzallright = pyFinal.callPackage ./nix/lzallright { };
31+
32+
# The reason for everything
1533
unblob = pyFinal.callPackage ./nix/unblob { };
34+
35+
# Own package updated independently of nixpkgs
36+
unblob-native = inputs.unblob-native.packages.${final.system}.default;
1637
});
1738
};
18-
lief = prev.lief.overrideAttrs (super: {
19-
postPatch = ''
20-
substituteInPlace setup.py \
21-
--replace 'cmake_args = ["-DLIEF_FORCE_API_EXPORTS=ON", "-DLIEF_PYTHON_API=on"]' 'cmake_args = ["-DLIEF_FORCE_API_EXPORTS=ON", "-DLIEF_PYTHON_API=on", "-DLIEF_EXAMPLES=off"]'
22-
'';
23-
});
39+
40+
# Existing alias is rebound to the updated package set for consistence
2441
python3Packages = final.python3.pkgs;
42+
43+
# Own package updated independently of nixpkgs
44+
ubi_reader = final.callPackage ./nix/ubi_reader { };
2545
}

0 commit comments

Comments
 (0)