diff --git a/pkgs/additional/linux-exynos5-mainline/default.nix b/pkgs/additional/linux-exynos5-mainline/default.nix index 4aba9a8b..4941ed67 100644 --- a/pkgs/additional/linux-exynos5-mainline/default.nix +++ b/pkgs/additional/linux-exynos5-mainline/default.nix @@ -1,13 +1,14 @@ -{ buildLinux +{ lib +, buildLinux , fetchFromGitLab #v nixpkgs calls `.override` on the kernel to configure additional things , features ? {} -, kernelPatches ? [] +, kernelPatches ? null , randstructSeed ? "" , structuredExtraConfig ? {} , ... }: -buildLinux { +buildLinux ({ src = fetchFromGitLab { owner = "exynos5-mainline"; repo = "linux"; @@ -23,5 +24,9 @@ buildLinux { autoModules = false; # preferBuiltin = false; - inherit features kernelPatches randstructSeed structuredExtraConfig; -} + inherit features randstructSeed structuredExtraConfig; +} // lib.optionalAttrs (builtins.isList kernelPatches) { + # callPackage mucks with `kernelPatches`: only forward this argument if it's a list, + # as expected by `buildLinux` + inherit kernelPatches; +}) diff --git a/scripts/check-nur b/scripts/check-nur index 34200744..562503f4 100755 --- a/scripts/check-nur +++ b/scripts/check-nur @@ -1,7 +1,8 @@ #!/bin/sh -cd ../integrations/nur +NIX_FILES_TOP=/home/colin/nixos +cd $NIX_FILES_TOP/integrations/nur # TODO: should include `-I nixpkgs=` -NIX_PATH= NIXPKGS_ALLOW_UNSUPPORTED_SYSTEM=1 nix-env -f . -qa \* --meta --xml \ +NIX_PATH= NIXPKGS_ALLOW_UNSUPPORTED_SYSTEM=1 nix-env -f . -qa linux\* --meta --xml \ --allowed-uris https://static.rust-lang.org \ --option restrict-eval true \ --option allow-import-from-derivation true \