diff options
Diffstat (limited to 'nixpkgs/pkgs/tools/misc/calamares/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/tools/misc/calamares/default.nix | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/nixpkgs/pkgs/tools/misc/calamares/default.nix b/nixpkgs/pkgs/tools/misc/calamares/default.nix index de37fef3a506..00a06b857b0d 100644 --- a/nixpkgs/pkgs/tools/misc/calamares/default.nix +++ b/nixpkgs/pkgs/tools/misc/calamares/default.nix @@ -1,5 +1,5 @@ { lib, fetchurl, boost, cmake, extra-cmake-modules, kparts, kpmcore, kirigami2 -, kservice, libatasmart, libxcb, libyamlcpp, libpwquality, parted, polkit-qt, python +, kservice, libatasmart, libxcb, yaml-cpp, libpwquality, parted, polkit-qt, python , qtbase, qtquickcontrols, qtsvg, qttools, qtwebengine, util-linux, tzdata , ckbcomp, xkeyboard_config, mkDerivation , nixos-extensions ? false @@ -7,12 +7,12 @@ mkDerivation rec { pname = "calamares"; - version = "3.2.60"; + version = "3.2.62"; # release including submodule src = fetchurl { url = "https://github.com/calamares/calamares/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-nsbEn04jFs0wWNQCwqtl7/8C4/CaACjVDwNZ5RVObIw="; + sha256 = "sha256-oPvOwqQ4aTdT/BdCIDVhGa1624orGcMXUYqhywJdbdA="; }; patches = lib.optionals nixos-extensions [ @@ -36,12 +36,14 @@ mkDerivation rec { # Fix setting the kayboard layout on GNOME wayland # By default the module uses the setxkbmap, which will not change the keyboard ./waylandkbd.patch + # Change default location where calamares searches for locales + ./supportedlocale.patch ]; nativeBuildInputs = [ cmake extra-cmake-modules ]; buildInputs = [ boost kparts.dev kpmcore.out kservice.dev kirigami2 - libatasmart libxcb libyamlcpp libpwquality parted polkit-qt python + libatasmart libxcb yaml-cpp libpwquality parted polkit-qt python qtbase qtquickcontrols qtsvg qttools qtwebengine.dev util-linux ]; |