mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-24 16:03:23 +00:00
Merge pull request #8461 from dezgeg/pr-calamares-fixes
calamares: Patch out all file references to /usr
This commit is contained in:
commit
e149ba4768
@ -1,5 +1,6 @@
|
||||
{ stdenv, fetchgit, cmake, qt5, polkit_qt5, libyamlcpp, python, boost, parted
|
||||
, extra-cmake-modules, kconfig, ki18n, kcoreaddons, solid, utillinux, libatasmart }:
|
||||
, extra-cmake-modules, kconfig, ki18n, kcoreaddons, solid, utillinux, libatasmart
|
||||
, ckbcomp, glibc, tzdata, xkeyboard_config }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "calamares-${version}";
|
||||
@ -22,6 +23,25 @@ stdenv.mkDerivation rec {
|
||||
"-DWITH_PARTITIONMANAGER=1"
|
||||
];
|
||||
|
||||
patchPhase = ''
|
||||
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}/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
|
||||
|
||||
sed -e 's,"ckbcomp","${ckbcomp}/bin/ckbcomp",' \
|
||||
-i src/modules/keyboard/keyboardwidget/keyboardpreview.cpp
|
||||
'';
|
||||
|
||||
preInstall = ''
|
||||
substituteInPlace cmake_install.cmake --replace "${polkit_qt5}" "$out"
|
||||
'';
|
||||
|
Loading…
Reference in New Issue
Block a user