Unverified Commit e5e058dc authored by wrvsrx's avatar wrvsrx
Browse files

calibre: avoid wrap PYTHONPATH

parent 53e0568a
Loading
Loading
Loading
Loading
+42 −42
Original line number Diff line number Diff line
@@ -91,9 +91,8 @@ stdenv.mkDerivation (finalAttrs: {
    qtbase
    qtwayland
    sqlite
    xdg-utils
  ] ++ (
    with python3Packages; [
    (python3Packages.python.withPackages
      (ps: with ps; [
        (apsw.overrideAttrs (oldAttrs: {
          setupPyBuildFlags = [ "--enable=load_extension" ];
        }))
@@ -130,8 +129,10 @@ stdenv.mkDerivation (finalAttrs: {
        # browser, so we enable building on platforms which qtwebengine
        # does not support by simply omitting qtwebengine.
        pyqt6-webengine
    ] ++ lib.optional (unrarSupport) unrardll
  ) ++ lib.optional (speechSupport) speechd;
      ] ++ lib.optional (unrarSupport) unrardll)
    )
    xdg-utils
  ] ++ lib.optional (speechSupport) speechd;

  installPhase = ''
    runHook preInstall
@@ -148,7 +149,7 @@ stdenv.mkDerivation (finalAttrs: {
    export XDG_DATA_HOME=$out/share
    export XDG_UTILS_INSTALL_MODE="user"

    ${python3Packages.python.pythonOnBuildForHost.interpreter} setup.py install --root=$out \
    python setup.py install --root=$out \
      --prefix=$out \
      --libdir=$out/lib \
      --staging-root=$out \
@@ -181,7 +182,6 @@ stdenv.mkDerivation (finalAttrs: {
        wrapProgram $program \
          ''${qtWrapperArgs[@]} \
          ''${gappsWrapperArgs[@]} \
          --prefix PYTHONPATH : $PYTHONPATH \
          ${if popplerSupport then popplerArgs else ""}
      done
    '';