Commit d248a1e7 authored by Robert Schütz's avatar Robert Schütz Committed by Artturin
Browse files

qutebrowser-qt5: replace qt5.qutebrowser 

Applications don't belong in the qt5 scope.
parent 0d93ec62

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
@@ -346,6 +346,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

+4 −0
Original line number Diff line number Diff line
@@ -35047,6 +35047,10 @@ with pkgs; 
    inherit (qt6Packages) qtbase qtwebengine wrapQtAppsHook qtwayland;

  };













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













    inherit (__splicedPackages.libsForQt5) qtbase qtwebengine wrapQtAppsHook qtwayland;













  };



























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





























  rabbitvcs = callPackage ../applications/version-management/rabbitvcs { };