diff options
-rw-r--r-- | app-admin/calamares/calamares-2.3-r5.ebuild (renamed from app-admin/calamares/calamares-2.3-r4.ebuild) | 10 | ||||
-rwxr-xr-x | app-admin/calamares/files/calamares-pkexec | 7 |
2 files changed, 17 insertions, 0 deletions
diff --git a/app-admin/calamares/calamares-2.3-r4.ebuild b/app-admin/calamares/calamares-2.3-r5.ebuild index 3366b1c0..935a9551 100644 --- a/app-admin/calamares/calamares-2.3-r4.ebuild +++ b/app-admin/calamares/calamares-2.3-r5.ebuild @@ -52,6 +52,9 @@ src_prepare() { epatch ${FILESDIR}/${PN}-kogaion-dracut-call.patch # replace calamares installer desktop icon sed -i "s/Icon=calamares/Icon=start-here/g" "${S}/calamares.desktop" + # fix installer doesn't start from desktop launcher (IMPROVE THIS UGLY THINGY) + sed -i "s/pkexec //g" "${S}/calamares.desktop" + sed -i "s/calamares/calamares-pkexec/g" "${S}/calamares.desktop" # If qtchooser is installed, it may break the build, because moc,rcc and uic binaries for wrong qt version may be used. # Setting QT_SELECT environment variable will enforce correct binaries (fix taken from vlc ebuild) export QT_SELECT=qt5 @@ -63,3 +66,10 @@ src_configure() { ) cmake-utils_src_configure } + +src_install() { + cmake-utils_src_install + insinto /usr/bin + insopts -m 755 + doins ${FILESDIR}/calamares-pkexec +} diff --git a/app-admin/calamares/files/calamares-pkexec b/app-admin/calamares/files/calamares-pkexec new file mode 100755 index 00000000..16334252 --- /dev/null +++ b/app-admin/calamares/files/calamares-pkexec @@ -0,0 +1,7 @@ +#!/usr/bin/env bash + +main() { + pkexec /usr/bin/calamares +} + +main |