mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-18 11:44:07 +00:00
unionfs-fuse: Fix conditional expressions
This commit is contained in:
parent
c59761e994
commit
bf2707d359
@ -1,21 +1,24 @@
|
|||||||
{ config, pkgs, ... }:
|
{ config, pkgs, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
config = pkgs.lib.mkIf (pkgs.lib.any (fs: fs == "unionfs-fuse") config.boot.initrd.supportedFilesystems) {
|
config = pkgs.lib.mkMerge [
|
||||||
boot.initrd.kernelModules = [ "fuse" ];
|
(pkgs.lib.mkIf (pkgs.lib.any (fs: fs == "unionfs-fuse") config.boot.initrd.supportedFilesystems) {
|
||||||
|
boot.initrd.kernelModules = [ "fuse" ];
|
||||||
|
|
||||||
boot.initrd.extraUtilsCommands = ''
|
boot.initrd.extraUtilsCommands = ''
|
||||||
cp -v ${pkgs.fuse}/lib/libfuse* $out/lib
|
cp -v ${pkgs.fuse}/lib/libfuse* $out/lib
|
||||||
cp -v ${pkgs.unionfs-fuse}/bin/unionfs $out/bin
|
cp -v ${pkgs.unionfs-fuse}/bin/unionfs $out/bin
|
||||||
'';
|
|
||||||
|
|
||||||
boot.initrd.postDeviceCommands = ''
|
|
||||||
# Hacky!!! fuse hard-codes the path to mount
|
|
||||||
mkdir -p /nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-${pkgs.utillinux.name}/bin
|
|
||||||
ln -s $(which mount) /nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-${pkgs.utillinux.name}/bin
|
|
||||||
ln -s $(which umount) /nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-${pkgs.utillinux.name}/bin
|
|
||||||
'';
|
'';
|
||||||
} // pkgs.lib.mkIf (pkgs.lib.any (fs: fs == "unionfs-fuse") config.boot.supportedFilesystems) {
|
|
||||||
system.fsPackages = [ pkgs.unionfs-fuse ];
|
boot.initrd.postDeviceCommands = ''
|
||||||
};
|
# Hacky!!! fuse hard-codes the path to mount
|
||||||
|
mkdir -p /nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-${pkgs.utillinux.name}/bin
|
||||||
|
ln -s $(which mount) /nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-${pkgs.utillinux.name}/bin
|
||||||
|
ln -s $(which umount) /nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-${pkgs.utillinux.name}/bin
|
||||||
|
'';
|
||||||
|
})
|
||||||
|
(pkgs.lib.mkIf (pkgs.lib.any (fs: fs == "unionfs-fuse") config.boot.supportedFilesystems) {
|
||||||
|
system.fsPackages = [ pkgs.unionfs-fuse ];
|
||||||
|
})
|
||||||
|
];
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user