diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2019-08-27 16:36:47 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-08-27 16:36:47 +0200 |
commit | 98640fd48212f8e6552517f667bba1901f5936d4 (patch) | |
tree | 0b5f895f31f16b47e8f837c1d3ac87da1f2884eb /pkgs/desktops/lxqt/liblxqt/default.nix | |
parent | 70c1c856d4c96fb37b6e507db4acb125656f992d (diff) | |
parent | b40ee8268515d78b419f53fb22a9fad49b985de8 (diff) | |
download | nixpkgs-98640fd48212f8e6552517f667bba1901f5936d4.tar nixpkgs-98640fd48212f8e6552517f667bba1901f5936d4.tar.gz nixpkgs-98640fd48212f8e6552517f667bba1901f5936d4.tar.bz2 nixpkgs-98640fd48212f8e6552517f667bba1901f5936d4.tar.lz nixpkgs-98640fd48212f8e6552517f667bba1901f5936d4.tar.xz nixpkgs-98640fd48212f8e6552517f667bba1901f5936d4.tar.zst nixpkgs-98640fd48212f8e6552517f667bba1901f5936d4.zip |
Merge master into staging-next
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 19335860599..d94b1ac0d03 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; |