pyrox.dev / nixpkgs
lol
fork atom

qolibri: move to by-name, switch to Qt6 (#438354)

authored by Fabián Heredia Montiel and committed by GitHub 3d6c0a8f 14d90367

+9 -11
unified split
+9 -9
pkgs/applications/misc/qolibri/default.nix pkgs/by-name/qo/qolibri/package.nix
··· 1 1 { 2 - stdenv, 2 + cmake, 3 + fetchFromGitHub, 3 4 lib, 4 - fetchFromGitHub, 5 - cmake, 6 5 ninja, 7 - qttools, 8 - qtwebengine, 9 - wrapQtAppsHook, 6 + qt6Packages, 7 + stdenv, 10 8 }: 11 9 stdenv.mkDerivation { 12 10 pname = "qolibri"; ··· 22 20 nativeBuildInputs = [ 23 21 cmake 24 22 ninja 25 - qttools 26 - wrapQtAppsHook 23 + qt6Packages.qttools 24 + qt6Packages.wrapQtAppsHook 27 25 ]; 28 26 29 27 buildInputs = [ 30 - qtwebengine 28 + qt6Packages.qt5compat 29 + qt6Packages.qtmultimedia 30 + qt6Packages.qtwebengine 31 31 ]; 32 32 33 33 cmakeFlags = [
-2
pkgs/top-level/all-packages.nix
··· 8828 8828 inherit (lomiri) cmake-extras; 8829 8829 }; 8830 8830 8831 - qolibri = libsForQt5.callPackage ../applications/misc/qolibri { }; 8832 - 8833 8831 quarto = callPackage ../development/libraries/quarto { }; 8834 8832 8835 8833 quartoMinimal = callPackage ../development/libraries/quarto {