diff options
| author | José Romildo Malaquias <malaquias@gmail.com> | 2020-06-10 07:05:13 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-10 07:05:13 -0300 |
| commit | 7a25acbac4074994584712ae4dd9db655b67404a (patch) | |
| tree | cec1198ddf4ca2d674c1cdaf590ff6cf010b0482 /pkgs/desktops | |
| parent | d01d1da890f30441c80b6369d9818beefc823d9b (diff) | |
| parent | 177ac37bd94f9fe0873fb3d2c4fbc20d68c8cde7 (diff) | |
| download | nixlib-7a25acbac4074994584712ae4dd9db655b67404a.tar nixlib-7a25acbac4074994584712ae4dd9db655b67404a.tar.gz nixlib-7a25acbac4074994584712ae4dd9db655b67404a.tar.bz2 nixlib-7a25acbac4074994584712ae4dd9db655b67404a.tar.lz nixlib-7a25acbac4074994584712ae4dd9db655b67404a.tar.xz nixlib-7a25acbac4074994584712ae4dd9db655b67404a.tar.zst nixlib-7a25acbac4074994584712ae4dd9db655b67404a.zip | |
Merge pull request #89736 from romildo/fix.lumina-desktop
lumina.lumina: make bsdtar available for lumina-archiver
Diffstat (limited to 'pkgs/desktops')
| -rw-r--r-- | pkgs/desktops/lumina/lumina/default.nix | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/pkgs/desktops/lumina/lumina/default.nix b/pkgs/desktops/lumina/lumina/default.nix index 1b30b8cdb107..ff1810db6e6e 100644 --- a/pkgs/desktops/lumina/lumina/default.nix +++ b/pkgs/desktops/lumina/lumina/default.nix @@ -2,6 +2,7 @@ , mkDerivation , fetchFromGitHub , fluxbox +, libarchive , numlockx , qmake , qtbase @@ -33,6 +34,7 @@ mkDerivation rec { buildInputs = [ fluxbox # window manager for Lumina DE + libarchive # make `bsdtar` available for lumina-archiver numlockx # required for changing state of numlock at login qtbase qtmultimedia @@ -66,9 +68,12 @@ mkDerivation rec { substituteInPlace src-qt5/core-utils/lumina-config/pages/page_fluxbox_settings.cpp \ --replace 'LOS::AppPrefix()+"share/fluxbox' "\"${fluxbox}/share/fluxbox" + # Add full path of bsdtar to lumina-archiver + substituteInPlace src-qt5/desktop-utils/lumina-archiver/TarBackend.cpp \ + --replace '"bsdtar"' '"${stdenv.lib.getBin libarchive}/bin/bsdtar"' + # Fix desktop files for i in $(grep -lir 'OnlyShowIn=Lumina' src-qt5); do - echo ===== $i substituteInPlace $i --replace 'OnlyShowIn=Lumina' 'OnlyShowIn=X-Lumina' done ''; |