From 65ca2a4bbbaea67c734e225432b5464af697726c Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 20 Feb 2022 16:32:14 +0100
Subject: [PATCH] libxml2: More cleanups

---
 pkgs/development/libraries/libxml2/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix
index 64c10d0a7f5bf..cb9a6da864f06 100644
--- a/pkgs/development/libraries/libxml2/default.nix
+++ b/pkgs/development/libraries/libxml2/default.nix
@@ -14,7 +14,7 @@
 , libiconv
 , pythonSupport ? enableShared && stdenv.buildPlatform == stdenv.hostPlatform
 , icuSupport ? false
-, icu ? null
+, icu
 , enableShared ? stdenv.hostPlatform.libc != "msvcrt" && !stdenv.hostPlatform.isStatic
 , enableStatic ? !enableShared
 , gnome
@@ -95,7 +95,7 @@ stdenv.mkDerivation rec {
   ];
 
   installFlags = lib.optionals pythonSupport [
-    "pythondir=\"${placeholder "py"}/lib/${python.libPrefix}/site-packages\""
+    "pythondir=\"${placeholder "py"}/${python.sitePackages}\""
   ];
 
   enableParallelBuilding = true;
@@ -109,8 +109,9 @@ stdenv.mkDerivation rec {
     MACOSX_DEPLOYMENT_TARGET=10.16
   '';
 
-  preInstall = lib.optionalString pythonSupport
-    ''substituteInPlace python/libxml2mod.la --replace "${python}" "$py"'';
+  preInstall = lib.optionalString pythonSupport ''
+    substituteInPlace python/libxml2mod.la --replace "${python}" "$py"
+  '';
 
   postFixup = ''
     moveToOutput bin/xml2-config "$dev"