Unverified Commit cb586f82 authored by Robert Schütz's avatar Robert Schütz Committed by GitHub
Browse files

Merge pull request #326607 from dotlambda/qutebrowser 

qutebrowser: don't use distutils
parents 9445eba2 da062e0e

pkgs/applications/networking/browsers/qutebrowser/default.nix

+7 −5
Original line number Diff line number Diff line
@@ -43,15 +43,17 @@ python3.pkgs.buildPythonApplication { 
  buildInputs = [

    qtbase

    glib-networking

  ] ++ lib.optionals stdenv.isLinux [

    qtwayland

  ];



  nativeBuildInputs = [

    wrapQtAppsHook asciidoc

    docbook_xml_dtd_45 docbook_xsl libxml2 libxslt

    python3.pkgs.pygments

  ];



  propagatedBuildInputs = with python3.pkgs; ([

  dependencies = with python3.pkgs; [

    colorama

    pyyaml (if isQt6 then pyqt6-webengine else pyqtwebengine) jinja2 pygments

    # scripts and userscripts libs

    tldextract beautifulsoup4
@@ -62,8 +64,8 @@ python3.pkgs.buildPythonApplication { 
    adblock

    # for the qute-bitwarden user script to be able to copy the TOTP token to clipboard

    pyperclip

  ] ++ lib.optional stdenv.isLinux qtwayland

  );

  ];





  patches = [

    ./fix-restart.patch
@@ -83,7 +85,7 @@ python3.pkgs.buildPythonApplication { 
    runHook preInstall



    make -f misc/Makefile \

      PYTHON=${python3.pythonOnBuildForHost.interpreter} \

      PYTHON=${(python3.pythonOnBuildForHost.withPackages (ps: with ps; [ setuptools ])).interpreter} \

      PREFIX=. \

      DESTDIR="$out" \

      DATAROOTDIR=/share \

pkgs/top-level/all-packages.nix

+0 −2
Original line number Diff line number Diff line
@@ -33614,12 +33614,10 @@ with pkgs; 














  qutebrowser = callPackage ../applications/networking/browsers/qutebrowser {















    inherit (__splicedPackages.qt6Packages) qtbase qtwebengine wrapQtAppsHook qtwayland;













    python3 = python311;















  };





























  qutebrowser-qt5 = callPackage ../applications/networking/browsers/qutebrowser {















    inherit (__splicedPackages.libsForQt5) qtbase qtwebengine wrapQtAppsHook qtwayland;













    python3 = python311;















  };





























  qxw = callPackage ../applications/editors/qxw { };