Unverified Commit 81e35cc8 authored by Artturi's avatar Artturi Committed by GitHub
Browse files

Merge pull request #269626 from NixOS/backport-251671-to-release-23.11

parents f3ccc1ef 6d0eb53c

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

+3 −3
Original line number Diff line number Diff line
@@ -26,14 +26,14 @@ let 
    stripRoot = false;

  };



  pname = "qutebrowser";

  version = "3.0.2";

in



python3.pkgs.buildPythonApplication {

  inherit pname version;

  pname = "qutebrowser" + lib.optionalString (!isQt6) "-qt5";

  inherit version;

  src = fetchurl {

    url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/${pname}-${version}.tar.gz";

    url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/qutebrowser-${version}.tar.gz";

    hash = "sha256-pRiT3koSNRmvuDcjuc7SstmPTKUoUnjIHpvdqR7VvFE=";

  };

pkgs/development/libraries/qt-5/5.15/default.nix

+0 −1
Original line number Diff line number Diff line
@@ -375,6 +375,5 @@ let 
      if stdenv.buildPlatform == stdenv.hostPlatform

      then bootstrapScope.qttranslations

      else null;

    qutebrowser = final.callPackage ../../../../applications/networking/browsers/qutebrowser { };

  });

in finalScope

pkgs/top-level/all-packages.nix

+5 −1
Original line number Diff line number Diff line
@@ -35028,7 +35028,11 @@ with pkgs; 
  };















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













    inherit (qt6Packages) qtbase qtwebengine wrapQtAppsHook qtwayland;













    inherit (__splicedPackages.qt6Packages) qtbase qtwebengine wrapQtAppsHook qtwayland;













  };

























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













    inherit (__splicedPackages.libsForQt5) qtbase qtwebengine wrapQtAppsHook qtwayland;















  };





























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