Commit 0b261ba7 authored by Robert Schütz's avatar Robert Schütz
Browse files

qutebrowser: move to pkgs/by-name

parent bd77a41b

pkgs/applications/networking/browsers/qutebrowser/default.nix→pkgs/by-name/qu/qutebrowser/package.nix

+7 −10
Original line number Diff line number Diff line
@@ -4,7 +4,6 @@ 
  fetchurl,

  fetchzip,

  python3,

  wrapQtAppsHook,

  glib-networking,

  asciidoc,

  docbook_xml_dtd_45,
@@ -14,9 +13,7 @@ 
  withPdfReader ? true,

  pipewireSupport ? stdenv.hostPlatform.isLinux,

  pipewire,

  qtwayland,

  qtbase,

  qtwebengine,

  qt6Packages,

  enableWideVine ? false,

  widevine-cdm,

  # can cause issues on some graphics chips
@@ -25,7 +22,7 @@ 
}:



let

  isQt6 = lib.versions.major qtbase.version == "6";

  isQt6 = lib.versions.major qt6Packages.qtbase.version == "6";

  pdfjs =

    let

      version = "5.1.91";
@@ -54,11 +51,11 @@ python3.pkgs.buildPythonApplication { 


  buildInputs =

    [

      qtbase

      qt6Packages.qtbase

      glib-networking

    ]

    ++ lib.optionals stdenv.hostPlatform.isLinux [

      qtwayland

      qt6Packages.qtwayland

    ];



  build-system = with python3.pkgs; [
@@ -66,7 +63,7 @@ python3.pkgs.buildPythonApplication { 
  ];



  nativeBuildInputs = [

    wrapQtAppsHook

    qt6Packages.wrapQtAppsHook

    asciidoc

    docbook_xml_dtd_45

    docbook_xsl
@@ -148,7 +145,7 @@ python3.pkgs.buildPythonApplication { 
          --set-default QSG_RHI_BACKEND vulkan

        ''}

        ${lib.optionalString enableWideVine ''--add-flags "--qt-flag widevine-path=${widevine-cdm}/share/google/chrome/WidevineCdm/_platform_specific/linux_x64/libwidevinecdm.so"''}

        --set QTWEBENGINE_RESOURCES_PATH "${qtwebengine}/resources"

        --set QTWEBENGINE_RESOURCES_PATH "${qt6Packages.qtwebengine}/resources"

      )

    '';
@@ -158,7 +155,7 @@ python3.pkgs.buildPythonApplication { 
    description = "Keyboard-focused browser with a minimal GUI";

    license = licenses.gpl3Plus;

    mainProgram = "qutebrowser";

    platforms = if enableWideVine then [ "x86_64-linux" ] else qtwebengine.meta.platforms;

    platforms = if enableWideVine then [ "x86_64-linux" ] else qt6Packages.qtwebengine.meta.platforms;

    maintainers = with maintainers; [

      jagajaga

      rnhmjoj

pkgs/top-level/all-packages.nix

+2 −16
Original line number Diff line number Diff line
@@ -15969,22 +15969,8 @@ with pkgs; 
    withXineBackend = true;

  };













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













    inherit (__splicedPackages.qt6Packages)













      qtbase













      qtwebengine













      wrapQtAppsHook













      qtwayland













      ;













  };

























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













    inherit (__splicedPackages.libsForQt5)













      qtbase













      qtwebengine













      wrapQtAppsHook













      qtwayland













      ;













  qutebrowser-qt5 = qutebrowser.override {













    qt6Packages = libsForQt5;















  };





























  rakarrack = callPackage ../applications/audio/rakarrack {