From 73779ab8d4bf97c775d84d9511944c43fd053e1a Mon Sep 17 00:00:00 2001 From: freezeboy Date: Thu, 17 Sep 2020 23:34:46 +0200 Subject: [PATCH] accounts-qt: migrate to libsForQt5 derivations to fix cmake config Co-authored-by: Thomas Tuegel --- pkgs/development/libraries/accounts-qt/default.nix | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/accounts-qt/default.nix b/pkgs/development/libraries/accounts-qt/default.nix index b60d8d07385..4e2e33b852e 100644 --- a/pkgs/development/libraries/accounts-qt/default.nix +++ b/pkgs/development/libraries/accounts-qt/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitLab, doxygen, glib, libaccounts-glib, pkgconfig, qtbase, qmake }: +{ mkDerivation, lib, fetchFromGitLab, doxygen, glib, libaccounts-glib, pkgconfig, qmake }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "accounts-qt"; version = "1.16"; @@ -11,17 +11,13 @@ stdenv.mkDerivation rec { owner = "accounts-sso"; }; - buildInputs = [ glib libaccounts-glib qtbase ]; + propagatedBuildInputs = [ glib libaccounts-glib ]; nativeBuildInputs = [ doxygen pkgconfig qmake ]; - preConfigure = '' - qmakeFlags="$qmakeFlags LIBDIR=$out/lib CMAKE_CONFIG_PATH=$out/lib/cmake" - ''; - # Hack to avoid TMPDIR in RPATHs. preFixup = ''rm -rf "$(pwd)" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Qt library for accessing the online accounts database"; homepage = "https://gitlab.com/accounts-sso"; license = licenses.lgpl21;