diff options
| author | Florian Klink <flokli@flokli.de> | 2020-05-24 02:27:51 +0200 |
|---|---|---|
| committer | Florian Klink <flokli@flokli.de> | 2020-07-12 23:04:33 +0200 |
| commit | d3a991d41028c5d2a5af2796c0bb542836457822 (patch) | |
| tree | 0ac9575cd5364fda5c43c85e5a337a03b3161f9d | |
| parent | df67459b89d69b9edde653efa6cb8d702179be0b (diff) | |
| download | nixpkgs-d3a991d41028c5d2a5af2796c0bb542836457822.tar nixpkgs-d3a991d41028c5d2a5af2796c0bb542836457822.tar.gz nixpkgs-d3a991d41028c5d2a5af2796c0bb542836457822.tar.bz2 nixpkgs-d3a991d41028c5d2a5af2796c0bb542836457822.tar.lz nixpkgs-d3a991d41028c5d2a5af2796c0bb542836457822.tar.xz nixpkgs-d3a991d41028c5d2a5af2796c0bb542836457822.tar.zst nixpkgs-d3a991d41028c5d2a5af2796c0bb542836457822.zip | |
lvm2: add multiple output support
| -rw-r--r-- | nixos/modules/system/boot/stage-1.nix | 6 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/lvm2/default.nix | 9 |
2 files changed, 12 insertions, 3 deletions
diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix index d551466f52e..63005b26f6f 100644 --- a/nixos/modules/system/boot/stage-1.nix +++ b/nixos/modules/system/boot/stage-1.nix @@ -111,8 +111,8 @@ let copy_bin_and_libs ${pkgs.utillinux}/sbin/blkid # Copy dmsetup and lvm. - copy_bin_and_libs ${pkgs.lvm2}/sbin/dmsetup - copy_bin_and_libs ${pkgs.lvm2}/sbin/lvm + copy_bin_and_libs ${getBin pkgs.lvm2}/bin/dmsetup + copy_bin_and_libs ${getBin pkgs.lvm2}/bin/lvm # Add RAID mdadm tool. copy_bin_and_libs ${pkgs.mdadm}/sbin/mdadm @@ -235,7 +235,7 @@ let --replace cdrom_id ${extraUtils}/bin/cdrom_id \ --replace ${pkgs.coreutils}/bin/basename ${extraUtils}/bin/basename \ --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.bash}/bin/sh ${extraUtils}/bin/sh \ --replace ${udev} ${extraUtils} diff --git a/pkgs/os-specific/linux/lvm2/default.nix b/pkgs/os-specific/linux/lvm2/default.nix index 6d62d770e4d..5dffe04fe72 100644 --- a/pkgs/os-specific/linux/lvm2/default.nix +++ b/pkgs/os-specific/linux/lvm2/default.nix @@ -28,6 +28,9 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-readline" "--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_cmdlib "--enable-cmdlib" ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ @@ -88,6 +91,12 @@ stdenv.mkDerivation rec { "install_tmpfiles_configuration" ]; + postInstall = '' + moveToOutput lib/libdevmapper.so $lib + ''; + + outputs = [ "out" "bin" "lib" "dev" "man" ]; + meta = with stdenv.lib; { homepage = "http://sourceware.org/lvm2/"; description = "Tools to support Logical Volume Management (LVM) on Linux"; |