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

pkgs/default.nix: conditionally import partially-upstreamed packages to fix NUR

This commit is contained in:
Colin 2023-05-24 05:52:45 +00:00
parent 839f51a6a2
commit 19f022a682
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
integrations/nur/default.nix
View File

@ -22,6 +22,9 @@
# ^ source: <https://github.com/nix-community/nur-packages-template/blob/master/.github/workflows/build.yml#L63>
# N.B.: nur eval allows only PATH (inherited) and NIXPKGS_ALLOW_UNSUPPORTED_SYSTEM="1" (forced),
# hence the erasing of NIX_PATH above (to remove external overlays)
#
# if it validates here but not upstream, likely to do with different `nixpkgs` inputs.
# - CI logs: <https://github.com/nix-community/NUR/actions/workflows/update.yml>
{ pkgs ? import <nixpkgs> {} }:
let

5
pkgs/default.nix
View File

@ -52,8 +52,9 @@ let
# ubootRaspberryPi4_64bit = callPackage ./additional/ubootRaspberryPi4_64bit { };
# provided by nixpkgs patch or upstream PR
# cargo-docset = callPackage ./additional/cargo-docset { };
# splatmoji = callPackage ./additional/splatmoji { };
# i still conditionally callPackage these to make them available to external consumers (like NUR)
cargo-docset = unpatched.cargo-docset or (callPackage ./additional/cargo-docset { });
splatmoji = unpatched.splatmoji or (callPackage ./additional/splatmoji { });
### PATCHED PACKAGES