nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-26 00:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #327817 from rhelmot/freebsd-out-of-tree

Browse Source 
freebsd.mkDerivation: do not crash on packages not using FreeBSD src
This commit is contained in:
John Ericson 2024-07-20 11:35:35 -04:00 committed by GitHub
commit 5e826c3d2d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/os-specific/bsd/freebsd/pkgs/drm-kmod/package.nix
View File

@ -22,6 +22,9 @@ let
fetchOptions = (lib.importJSON ./versions.json).${branch}; fetchOptions = (lib.importJSON ./versions.json).${branch};
in in
mkDerivation { mkDerivation {
# this derivation is tricky; it is not an in-tree FreeBSD build but it is meant to be built
# at the same time as the in-tree FreeBSD code, so it expects the same environment. Therefore,
# it is appropriate to use the freebsd mkDerivation.
pname = "drm-kmod"; pname = "drm-kmod";
version = branch; version = branch;

4
pkgs/os-specific/bsd/freebsd/pkgs/mkDerivation.nix
View File

@ -117,7 +117,9 @@ lib.makeOverridable (
// { // {
patches = patches =
(lib.optionals (attrs.autoPickPatches or true) ( (lib.optionals (attrs.autoPickPatches or true) (
freebsd-lib.filterPatches patches (attrs.extraPaths or [ ] ++ [ attrs.path ]) freebsd-lib.filterPatches patches (
attrs.extraPaths or [ ] ++ (lib.optional (attrs ? path) attrs.path)
)
)) ))
++ attrs.patches or [ ]; ++ attrs.patches or [ ];
} }