From 550334fd8ae1bd4d0e517dffa180b9274ec61416 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Thu, 18 Apr 2024 14:33:10 -0300 Subject: [PATCH] lxqt.compton-conf: use mkDerivation from stdenv --- pkgs/desktops/lxqt/compton-conf/default.nix | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/pkgs/desktops/lxqt/compton-conf/default.nix b/pkgs/desktops/lxqt/compton-conf/default.nix index f54fbd92bd35..be6d593b4177 100644 --- a/pkgs/desktops/lxqt/compton-conf/default.nix +++ b/pkgs/desktops/lxqt/compton-conf/default.nix @@ -1,17 +1,18 @@ -{ stdenv -, lib -, mkDerivation +{ lib +, stdenv , fetchFromGitHub , cmake +, libconfig +, lxqt-build-tools , pkg-config , qtbase , qttools -, lxqt -, libconfig +, qtx11extras +, wrapQtAppsHook , gitUpdater }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "compton-conf"; version = "0.16.0"; @@ -24,19 +25,21 @@ mkDerivation rec { nativeBuildInputs = [ cmake + lxqt-build-tools pkg-config - lxqt.lxqt-build-tools qttools + qtx11extras + wrapQtAppsHook ]; buildInputs = [ - qtbase libconfig + qtbase ]; preConfigure = '' substituteInPlace autostart/CMakeLists.txt \ - --replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg" \ + --replace-fail "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg" \ ''; passthru.updateScript = gitUpdater { };