diff options
| author | Robin Gloster <mail@glob.in> | 2019-08-25 18:15:01 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-25 18:15:01 +0200 |
| commit | 5292fd51f904b7441cb97aedf4a8db57524af87f (patch) | |
| tree | 298a60453fcd7027d53f7576fd56b10a006060af /pkgs/desktops/lxqt/liblxqt/default.nix | |
| parent | 6adb914c29f43331d18e4a9d1c3bd35135342f09 (diff) | |
| parent | e34de045b65ac7b812d980df85204644baeb60c9 (diff) | |
| download | nixlib-5292fd51f904b7441cb97aedf4a8db57524af87f.tar nixlib-5292fd51f904b7441cb97aedf4a8db57524af87f.tar.gz nixlib-5292fd51f904b7441cb97aedf4a8db57524af87f.tar.bz2 nixlib-5292fd51f904b7441cb97aedf4a8db57524af87f.tar.lz nixlib-5292fd51f904b7441cb97aedf4a8db57524af87f.tar.xz nixlib-5292fd51f904b7441cb97aedf4a8db57524af87f.tar.zst nixlib-5292fd51f904b7441cb97aedf4a8db57524af87f.zip | |
Merge pull request #65482 from worldofpeace/fix-lxqt
lxqt: use qt5's mkDerivation
Diffstat (limited to 'pkgs/desktops/lxqt/liblxqt/default.nix')
| -rw-r--r-- | pkgs/desktops/lxqt/liblxqt/default.nix | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/pkgs/desktops/lxqt/liblxqt/default.nix b/pkgs/desktops/lxqt/liblxqt/default.nix index 193358605995..d94b1ac0d030 100644 --- a/pkgs/desktops/lxqt/liblxqt/default.nix +++ b/pkgs/desktops/lxqt/liblxqt/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchFromGitHub, cmake, lxqt-build-tools, qtx11extras, +{ lib, mkDerivation, fetchFromGitHub, cmake, lxqt-build-tools, qtx11extras, qttools, qtsvg, libqtxdg, polkit-qt, kwindowsystem, xorg }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "liblxqt"; version = "0.14.1"; @@ -27,18 +27,11 @@ stdenv.mkDerivation rec { xorg.libXScrnSaver ]; - cmakeFlags = [ - "-DLXQT_ETC_XDG_DIR=/run/current-system/sw/etc/xdg" - ]; - postPatch = '' - sed -i 's|set(LXQT_SHARE_DIR .*)|set(LXQT_SHARE_DIR "/run/current-system/sw/share/lxqt")|' CMakeLists.txt sed -i "s|\''${POLKITQT-1_POLICY_FILES_INSTALL_DIR}|''${out}/share/polkit-1/actions|" CMakeLists.txt - substituteInPlace CMakeLists.txt \ - --replace "\''${LXQT_TRANSLATIONS_DIR}" "''${out}/share/lxqt/translations" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Core utility library for all LXQt components"; homepage = https://github.com/lxqt/liblxqt; license = licenses.lgpl21Plus; |