public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revive calamares

This commit is contained in:
Michael Fellinger 2017-12-09 00:12:26 +01:00
parent 3abcc2c514
commit b70a0bd08f
2 changed files with 35 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
pkgs/tools/misc/calamares/default.nix
View File

@ -1,57 +1,64 @@
{ stdenv, fetchurl, cmake, polkit-qt, libyamlcpp, python, boost, parted { stdenv, fetchurl, boost, cmake, extra-cmake-modules, kparts, kpmcore
, extra-cmake-modules, kconfig, ki18n, kcoreaddons, solid, utillinux, libatasmart , kservice, libatasmart, libxcb, libyamlcpp, parted, polkit-qt, python, qtbase
, ckbcomp, glibc, tzdata, xkeyboard_config, qtbase, qtsvg, qttools }: , qtquickcontrols, qtsvg, qttools, qtwebengine, utillinux, glibc, tzdata
, ckbcomp, xkeyboard_config
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
pname = "calamares"; pname = "calamares";
version = "1.1.4.2"; version = "3.1.10";
# release including submodule # release including submodule
src = fetchurl { src = fetchurl {
url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${name}.tar.gz"; url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${name}.tar.gz";
sha256 = "1mh0nmzc3i1aqcj79q2s3vpccn0mirlfbj26sfyb0v6gcrvf707d"; sha256 = "12phmirx0fgvykvkl8frv5agxqi7n04sxf5bpwjwq12mydq2x7kc";
}; };
buildInputs = [ buildInputs = [
cmake qtbase qtsvg qttools libyamlcpp python boost polkit-qt parted boost cmake extra-cmake-modules kparts.dev kpmcore.out kservice.dev
extra-cmake-modules kconfig ki18n kcoreaddons solid utillinux libatasmart libatasmart libxcb libyamlcpp parted polkit-qt python qtbase
qtquickcontrols qtsvg qttools qtwebengine.dev utillinux
]; ];
enableParallelBuilding = false;
cmakeFlags = [ cmakeFlags = [
"-DPYTHON_LIBRARY=${python}/lib/libpython${python.majorVersion}m.so" "-DPYTHON_LIBRARY=${python}/lib/libpython${python.majorVersion}m.so"
"-DPYTHON_INCLUDE_DIR=${python}/include/python${python.majorVersion}m" "-DPYTHON_INCLUDE_DIR=${python}/include/python${python.majorVersion}m"
"-DWITH_PARTITIONMANAGER=1" "-DCMAKE_VERBOSE_MAKEFILE=True"
"-DCMAKE_BUILD_TYPE=Release"
"-DWITH_PYTHONQT:BOOL=ON"
]; ];
POLKITQT-1_POLICY_FILES_INSTALL_DIR = "$(out)/share/polkit-1/actions";
patchPhase = '' patchPhase = ''
sed -e "s,/usr/bin/calamares,$out/bin/calamares," \ sed -e "s,/usr/bin/calamares,$out/bin/calamares," \
-i calamares.desktop \ -i calamares.desktop \
-i com.github.calamares.calamares.policy -i com.github.calamares.calamares.policy
sed -e 's,/usr/share/zoneinfo,${tzdata}/share/zoneinfo,' \ sed -e 's,/usr/share/zoneinfo,${tzdata}/share/zoneinfo,' \
-i src/modules/locale/timezonewidget/localeconst.h \ -i src/modules/locale/timezonewidget/localeconst.h \
-i src/modules/locale/SetTimezoneJob.cpp -i src/modules/locale/SetTimezoneJob.cpp
sed -e 's,/usr/share/i18n/locales,${glibc.out}/share/i18n/locales,' \ sed -e 's,/usr/share/i18n/locales,${glibc.out}/share/i18n/locales,' \
-i src/modules/locale/timezonewidget/localeconst.h -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,' \ 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 -i src/modules/keyboard/keyboardwidget/keyboardglobal.h
sed -e 's,"ckbcomp","${ckbcomp}/bin/ckbcomp",' \ sed -e 's,"ckbcomp","${ckbcomp}/bin/ckbcomp",' \
-i src/modules/keyboard/keyboardwidget/keyboardpreview.cpp -i src/modules/keyboard/keyboardwidget/keyboardpreview.cpp
'';
preInstall = '' sed "s,\''${POLKITQT-1_POLICY_FILES_INSTALL_DIR},''${out}/share/polkit-1/actions," \
substituteInPlace cmake_install.cmake --replace "${polkit-qt}" "$out" -i CMakeLists.txt
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Distribution-independent installer framework"; description = "Distribution-independent installer framework";
license = licenses.gpl3; license = licenses.gpl3;
maintainers = with stdenv.lib.maintainers; [ tstrobel ]; maintainers = with stdenv.lib.maintainers; [ manveru ];
platforms = platforms.linux; platforms = platforms.linux;
broken = true;
}; };
} }

6
pkgs/top-level/all-packages.nix
View File

@ -856,10 +856,10 @@ with pkgs;
caddy = callPackage ../servers/caddy { }; caddy = callPackage ../servers/caddy { };
traefik = callPackage ../servers/traefik { }; traefik = callPackage ../servers/traefik { };
calamares = qt5.callPackage ../tools/misc/calamares rec { calamares = libsForQt59.callPackage ../tools/misc/calamares {
python = python3; python = python3;
boost = pkgs.boost.override { python=python3; }; boost = pkgs.boost.override { python = python3; };
libyamlcpp = callPackage ../development/libraries/libyaml-cpp { boost=boost; }; libyamlcpp = callPackage ../development/libraries/libyaml-cpp { inherit boost; };
}; };
capstone = callPackage ../development/libraries/capstone { }; capstone = callPackage ../development/libraries/capstone { };