forked from colin/nix-files
pkgs/default.nix: conditionally import partially-upstreamed packages to fix NUR
This commit is contained in:
parent
839f51a6a2
commit
19f022a682
@ -22,6 +22,9 @@
|
|||||||
# ^ source: <https://github.com/nix-community/nur-packages-template/blob/master/.github/workflows/build.yml#L63>
|
# ^ 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),
|
# 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)
|
# 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> {} }:
|
{ pkgs ? import <nixpkgs> {} }:
|
||||||
let
|
let
|
||||||
|
@ -52,8 +52,9 @@ let
|
|||||||
# ubootRaspberryPi4_64bit = callPackage ./additional/ubootRaspberryPi4_64bit { };
|
# ubootRaspberryPi4_64bit = callPackage ./additional/ubootRaspberryPi4_64bit { };
|
||||||
|
|
||||||
# provided by nixpkgs patch or upstream PR
|
# provided by nixpkgs patch or upstream PR
|
||||||
# cargo-docset = callPackage ./additional/cargo-docset { };
|
# i still conditionally callPackage these to make them available to external consumers (like NUR)
|
||||||
# splatmoji = callPackage ./additional/splatmoji { };
|
cargo-docset = unpatched.cargo-docset or (callPackage ./additional/cargo-docset { });
|
||||||
|
splatmoji = unpatched.splatmoji or (callPackage ./additional/splatmoji { });
|
||||||
|
|
||||||
|
|
||||||
### PATCHED PACKAGES
|
### PATCHED PACKAGES
|
||||||
|
Loading…
Reference in New Issue
Block a user