From d24918b70e5aaa41aaa55b393cd1341377acfb00 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Sun, 27 Dec 2020 13:45:46 +0100
Subject: [PATCH] iwd: fix cross compilation
This derivation uses wrapPython to wrap some "test scripts" that are
shipped in the "test" output.
As these test scripts require gobject-introspection, which doesn't
cross-compile at all, let's only patch and ship them when not
cross-compiling.
---
pkgs/os-specific/linux/iwd/default.nix | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/pkgs/os-specific/linux/iwd/default.nix b/pkgs/os-specific/linux/iwd/default.nix
index 64ac3342acf..0cbd7ff3a3a 100644
--- a/pkgs/os-specific/linux/iwd/default.nix
+++ b/pkgs/os-specific/linux/iwd/default.nix
@@ -21,7 +21,8 @@ stdenv.mkDerivation rec {
sha256 = "0gzpdgfwzlqj2n3amf2zhi2hlpa412878yphgx79y6b5gn1y1lm2";
};
- outputs = [ "out" "man" "test" ];
+ outputs = [ "out" "man" ]
+ ++ stdenv.lib.optional (stdenv.hostPlatform == stdenv.buildPlatform) "test";
nativeBuildInputs = [
autoreconfHook
@@ -38,7 +39,9 @@ stdenv.mkDerivation rec {
checkInputs = [ openssl ];
- pythonPath = [
+ # wrapPython wraps the scripts in $test. They pull in gobject-introspection,
+ # which doesn't cross-compile.
+ pythonPath = stdenv.lib.optionals (stdenv.hostPlatform == stdenv.buildPlatform) [
python3Packages.dbus-python
python3Packages.pygobject3
];
@@ -61,11 +64,12 @@ stdenv.mkDerivation rec {
doCheck = true;
postInstall = ''
- mkdir -p $test/bin
- cp -a test/* $test/bin/
mkdir -p $out/share
cp -a doc $out/share/
cp -a README AUTHORS TODO $out/share/doc/
+ '' + stdenv.lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) ''
+ mkdir -p $test/bin
+ cp -a test/* $test/bin/
'';
preFixup = ''