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

clightning: lift the build fix into pkgs/default.nix

Browse Source 
this lets me apply it outside the context of a nixos module
This commit is contained in:
Colin
2024-08-01 19:39:39 +00:00
parent 00a25f1533
commit acd46940e4
2 changed files with 7 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
modules/services/clightning.nix
View File

@@ -33,14 +33,7 @@ in
options = with lib; {
sane.services.clightning = {
enable = mkEnableOption "clightning, a Lightning Network implementation in C";
# package = mkPackageOption pkgs "clightning" { };
package = mkOption {
type = types.package;
default = pkgs.clightning.override {
# XXX(2024/07/07): build fails with default `python3`
python3 = pkgs.python311;
};
};
package = mkPackageOption pkgs "clightning" { };
bitcoindName = mkOption {
type = types.str;
default = "mainnet";

17
pkgs/default.nix
View File

@@ -151,25 +151,20 @@ let
# - unpatched.XYZ draws (selectively) from the _unpatched_ package set.
# see <overlays/pkgs.nix>
# XXX patching this is... really costly.
# prefer to set ALSA_CONFIG_UCM2 = "${pkgs.alsa-ucm-conf-sane}/share/alsa/ucm2" if possible instead.
# alsa-project = unpatched.alsa-project.overrideScope (sself: ssuper: {
# alsa-ucm-conf = sself.callPackage ./additional/alsa-ucm-conf-sane { inherit (ssuper) alsa-ucm-conf; };
# });
#### short-term build fixes
clightning = unpatched.clightning.override {
# XXX(2024-07-07): build fails with default `python3`
python3 = pkgs.python311;
};
#### long-term patching
browserpass = callPackage ./patched/browserpass { inherit (unpatched) browserpass; };
# mozilla keeps nerfing itself and removing configuration options
firefox-unwrapped = callPackage ./patched/firefox-unwrapped { inherit (unpatched) firefox-unwrapped; };
gocryptfs = callPackage ./patched/gocryptfs { inherit (unpatched) gocryptfs; };
helix = callPackage ./patched/helix { inherit (unpatched) helix; };
# ibus = callPackage ./patched/ibus { inherit (unpatched) ibus; };
# modemmanager = callPackage ./patched/modemmanager { inherit (unpatched) modemmanager; };
playerctl = unpatched.playerctl.overrideAttrs (upstream: {
patches = (upstream.patches or []) ++ [
(fetchpatch {