about summary refs log tree commit diff
path: root/pkgs/os-specific
diff options
context:
space:
mode:
authorAlyssa Ross <hi@alyssa.is>2022-03-29 10:27:31 +0000
committerAlyssa Ross <hi@alyssa.is>2022-03-29 12:14:16 +0000
commit05a6c124e65d30b5e68468c8b87f73d6b1a8c587 (patch)
treefeebee1c554f1cd8dcb8e9faa5dd1fd5e137578d /pkgs/os-specific
parente7da834115e855f2a5c802a8ab4c9c8e1a6d97ea (diff)
downloadnixlib-05a6c124e65d30b5e68468c8b87f73d6b1a8c587.tar
nixlib-05a6c124e65d30b5e68468c8b87f73d6b1a8c587.tar.gz
nixlib-05a6c124e65d30b5e68468c8b87f73d6b1a8c587.tar.bz2
nixlib-05a6c124e65d30b5e68468c8b87f73d6b1a8c587.tar.lz
nixlib-05a6c124e65d30b5e68468c8b87f73d6b1a8c587.tar.xz
nixlib-05a6c124e65d30b5e68468c8b87f73d6b1a8c587.tar.zst
nixlib-05a6c124e65d30b5e68468c8b87f73d6b1a8c587.zip
lvm2: don't use targetPlatform
targetPlatform is the platform the current package's programs will
produce binaries for — only relevant for compilers and
similar. hostPlatform is the platform the current package's programs
will run on.

The incorrect use of targetPlatform meant that anything that tried to
link to it (like cryptsetup) would fail to build when it was used as a
native build input for a cross-compiled Musl derivation.

Fixes: 2cc29125a72 ("lvm2: package 2.02.x for musl")
Diffstat (limited to 'pkgs/os-specific')
-rw-r--r--pkgs/os-specific/linux/lvm2/common.nix10
1 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/os-specific/linux/lvm2/common.nix b/pkgs/os-specific/linux/lvm2/common.nix
index 0f2e6efe3a26..07e8c9cb02da 100644
--- a/pkgs/os-specific/linux/lvm2/common.nix
+++ b/pkgs/os-specific/linux/lvm2/common.nix
@@ -9,8 +9,8 @@
 , libaio
 , enableCmdlib ? false
 , enableDmeventd ? false
-, udevSupport ? !stdenv.targetPlatform.isStatic, udev ? null
-, onlyLib ? stdenv.targetPlatform.isStatic
+, udevSupport ? !stdenv.hostPlatform.isStatic, udev ? null
+, onlyLib ? stdenv.hostPlatform.isStatic
 , nixosTests
 }:
 
@@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
   ] ++ lib.optionals udevSupport [
     "--enable-udev_rules"
     "--enable-udev_sync"
-  ] ++ lib.optionals stdenv.targetPlatform.isStatic [
+  ] ++ lib.optionals stdenv.hostPlatform.isStatic [
     "--enable-static_link"
   ];
 
@@ -91,7 +91,7 @@ stdenv.mkDerivation rec {
       url = "https://git.alpinelinux.org/aports/plain/main/lvm2/mallinfo.patch?h=3.7-stable&id=31bd4a8c2dc00ae79a821f6fe0ad2f23e1534f50";
       sha256 = "0g6wlqi215i5s30bnbkn8w7axrs27y3bnygbpbnf64wwx7rxxlj0";
     })
-  ] ++ lib.optionals stdenv.targetPlatform.isStatic [
+  ] ++ lib.optionals stdenv.hostPlatform.isStatic [
     ./no-shared.diff
   ];
 
@@ -114,7 +114,7 @@ stdenv.mkDerivation rec {
   ];
 
   installPhase = lib.optionalString onlyLib ''
-    install -D -t $out/lib libdm/ioctl/libdevmapper.${if stdenv.targetPlatform.isStatic then "a" else "so"}
+    install -D -t $out/lib libdm/ioctl/libdevmapper.${if stdenv.hostPlatform.isStatic then "a" else "so"}
     make -C libdm install_include
     make -C libdm install_pkgconfig
   '';