diff options
author | freezeboy <freezeboy@users.noreply.github.com> | 2020-12-27 20:30:23 +0100 |
---|---|---|
committer | freezeboy <freezeboy@users.noreply.github.com> | 2020-12-28 17:07:10 +0100 |
commit | 917ec074ba32bf2ba6cf2b00fd1e7c33d245a313 (patch) | |
tree | e2e9525690bd343987ad82850ee731225c085b42 /pkgs/tools/misc/calamares/default.nix | |
parent | f71e439688e4c4b231e0f419f81df6610fdaa231 (diff) |
calamares: 3.2.17.1 -> 3.2.35.1
Diffstat (limited to 'pkgs/tools/misc/calamares/default.nix')
-rw-r--r-- | pkgs/tools/misc/calamares/default.nix | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/pkgs/tools/misc/calamares/default.nix b/pkgs/tools/misc/calamares/default.nix index 815129f7f0f74..a671090460ea0 100644 --- a/pkgs/tools/misc/calamares/default.nix +++ b/pkgs/tools/misc/calamares/default.nix @@ -6,16 +6,17 @@ mkDerivation rec { pname = "calamares"; - version = "3.2.17.1"; + version = "3.2.35.1"; # release including submodule src = fetchurl { url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "156zpjyw8w4y23aa60mvg3d3mr0kzfq5jkl7ixgahq33zpc17ms8"; + sha256 = "s2wnwcdrcJLG5NhugSkntBCYfPuv3T/9+PclbmK0BJ4="; }; + nativeBuildInputs = [ cmake extra-cmake-modules ]; buildInputs = [ - boost cmake extra-cmake-modules kparts.dev kpmcore.out kservice.dev + boost kparts.dev kpmcore.out kservice.dev libatasmart libxcb libyamlcpp parted polkit-qt python qtbase qtquickcontrols qtsvg qttools qtwebengine.dev util-linux ]; @@ -32,18 +33,14 @@ mkDerivation rec { POLKITQT-1_POLICY_FILES_INSTALL_DIR = "$(out)/share/polkit-1/actions"; - patchPhase = '' + postPatch = '' sed -e "s,/usr/bin/calamares,$out/bin/calamares," \ -i calamares.desktop \ -i com.github.calamares.calamares.policy sed -e 's,/usr/share/zoneinfo,${tzdata}/share/zoneinfo,' \ - -i src/modules/locale/timezonewidget/localeconst.h \ -i src/modules/locale/SetTimezoneJob.cpp - sed -e 's,/usr/share/i18n/locales,${glibc.out}/share/i18n/locales,' \ - -i src/modules/locale/timezonewidget/localeconst.h - sed -e 's,/usr/share/X11/xkb/rules/base.lst,${xkeyboard_config}/share/X11/xkb/rules/base.lst,' \ -i src/modules/keyboard/keyboardwidget/keyboardglobal.h @@ -56,8 +53,8 @@ mkDerivation rec { meta = with lib; { description = "Distribution-independent installer framework"; - license = licenses.gpl3; - maintainers = with lib.maintainers; [ manveru ]; + license = with licenses; [ gpl3Plus bsd2 ]; + maintainers = with maintainers; [ manveru ]; platforms = platforms.linux; }; } |