nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-10-02 21:10:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #149777 from NixOS/backport-149244-to-staging-21.11

Browse Source 
[Backport staging-21.11] kmod: switch the priority of module dirs
This commit is contained in:
Jörg Thalheim
2021-12-09 08:21:44 +00:00
committed by GitHub
parent 05ba6ccfe0 e3624bed49
commit f7def68d28
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/os-specific/linux/kmod/default.nix
View File

@@ -4,7 +4,7 @@
}:
let
systems = [ "/run/current-system/kernel-modules" "/run/booted-system/kernel-modules" "" ];
systems = [ "/run/booted-system/kernel-modules" "/run/current-system/kernel-modules" "" ];
modulesDirs = lib.concatMapStringsSep ":" (x: "${x}/lib/modules") systems;
in stdenv.mkDerivation rec {
@@ -52,5 +52,6 @@ in stdenv.mkDerivation rec {
changelog = "https://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git/plain/NEWS?h=v${version}";
license = with licenses; [ lgpl21Plus gpl2Plus ]; # GPLv2+ for tools
platforms = platforms.unix;
maintainers = with maintainers; [ artturin ];
};
}