ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2025-01-06 04:24:28 +03:00
Code Issues Projects Releases Wiki Activity

lvm2: add multiple output support

Browse Source
This commit is contained in:
Florian Klink 2020-05-24 02:27:51 +02:00
parent df67459b89
commit d3a991d410
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nixos/modules/system/boot/stage-1.nix
View File

@ -111,8 +111,8 @@ let
copy_bin_and_libs ${pkgs.utillinux}/sbin/blkid copy_bin_and_libs ${pkgs.utillinux}/sbin/blkid
# Copy dmsetup and lvm. # Copy dmsetup and lvm.
copy_bin_and_libs ${pkgs.lvm2}/sbin/dmsetup copy_bin_and_libs ${getBin pkgs.lvm2}/bin/dmsetup
copy_bin_and_libs ${pkgs.lvm2}/sbin/lvm copy_bin_and_libs ${getBin pkgs.lvm2}/bin/lvm
# Add RAID mdadm tool. # Add RAID mdadm tool.
copy_bin_and_libs ${pkgs.mdadm}/sbin/mdadm copy_bin_and_libs ${pkgs.mdadm}/sbin/mdadm
@ -235,7 +235,7 @@ let
--replace cdrom_id ${extraUtils}/bin/cdrom_id \ --replace cdrom_id ${extraUtils}/bin/cdrom_id \
--replace ${pkgs.coreutils}/bin/basename ${extraUtils}/bin/basename \ --replace ${pkgs.coreutils}/bin/basename ${extraUtils}/bin/basename \
--replace ${pkgs.utillinux}/bin/blkid ${extraUtils}/bin/blkid \ --replace ${pkgs.utillinux}/bin/blkid ${extraUtils}/bin/blkid \
--replace ${pkgs.lvm2}/sbin ${extraUtils}/bin \ --replace ${getBin pkgs.lvm2}/bin ${extraUtils}/bin \
--replace ${pkgs.mdadm}/sbin ${extraUtils}/sbin \ --replace ${pkgs.mdadm}/sbin ${extraUtils}/sbin \
--replace ${pkgs.bash}/bin/sh ${extraUtils}/bin/sh \ --replace ${pkgs.bash}/bin/sh ${extraUtils}/bin/sh \
--replace ${udev} ${extraUtils} --replace ${udev} ${extraUtils}

9
pkgs/os-specific/linux/lvm2/default.nix
View File

@ -28,6 +28,9 @@ stdenv.mkDerivation rec {
configureFlags = [ configureFlags = [
"--disable-readline" "--disable-readline"
"--enable-pkgconfig" "--enable-pkgconfig"
"--bindir=${placeholder "bin"}/bin"
"--sbindir=${placeholder "bin"}/bin"
"--libdir=${placeholder "lib"}/lib"
] ++ stdenv.lib.optional enable_dmeventd " --enable-dmeventd" ] ++ stdenv.lib.optional enable_dmeventd " --enable-dmeventd"
++ stdenv.lib.optional enable_cmdlib "--enable-cmdlib" ++ stdenv.lib.optional enable_cmdlib "--enable-cmdlib"
++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
@ -88,6 +91,12 @@ stdenv.mkDerivation rec {
"install_tmpfiles_configuration" "install_tmpfiles_configuration"
]; ];
postInstall = ''
moveToOutput lib/libdevmapper.so $lib
'';
outputs = [ "out" "bin" "lib" "dev" "man" ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = "http://sourceware.org/lvm2/"; homepage = "http://sourceware.org/lvm2/";
description = "Tools to support Logical Volume Management (LVM) on Linux"; description = "Tools to support Logical Volume Management (LVM) on Linux";