From d0ddf6415a6db51695620bce3d3c793b450ad6c6 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 2 Sep 2019 22:22:12 +0200 Subject: [PATCH] libproxy: split python outputs --- pkgs/development/libraries/libproxy/default.nix | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/libproxy/default.nix b/pkgs/development/libraries/libproxy/default.nix index 1e906fbeac1..78709edff64 100644 --- a/pkgs/development/libraries/libproxy/default.nix +++ b/pkgs/development/libraries/libproxy/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "10swd3x576pinx33iwsbd4h15fbh2snmfxzcmab4c56nb08qlbrs"; }; - outputs = [ "out" "dev" ]; + outputs = [ "out" "dev" "py2" "py3" ]; nativeBuildInputs = [ pkgconfig cmake ]; @@ -22,13 +22,11 @@ stdenv.mkDerivation rec { then [ SystemConfiguration CoreFoundation JavaScriptCore ] else [ spidermonkey_38 dbus networkmanager ]); - preConfigure = '' - cmakeFlagsArray+=( - "-DWITH_MOZJS=ON" - "-DPYTHON2_SITEPKG_DIR=$out/${python2.sitePackages}" - "-DPYTHON3_SITEPKG_DIR=$out/${python3.sitePackages}" - ) - ''; + cmakeFlags = [ + "-DWITH_MOZJS=ON" + "-DPYTHON2_SITEPKG_DIR=${placeholder "py2"}/${python2.sitePackages}" + "-DPYTHON3_SITEPKG_DIR=${placeholder "py3"}/${python3.sitePackages}" + ]; patches = stdenv.lib.optional stdenv.isDarwin (fetchpatch {