From f2236425b9f2176d165b9b303d5907b1a3f9b97e Mon Sep 17 00:00:00 2001 From: Michael Fellinger Date: Sun, 27 Oct 2019 10:37:06 +0100 Subject: calamares: fix qt path --- pkgs/tools/misc/calamares/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/misc/calamares/default.nix b/pkgs/tools/misc/calamares/default.nix index 3a6585514ab..4adadbf4707 100644 --- a/pkgs/tools/misc/calamares/default.nix +++ b/pkgs/tools/misc/calamares/default.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchurl, boost, cmake, extra-cmake-modules, kparts, kpmcore +{ lib, fetchurl, boost, cmake, extra-cmake-modules, kparts, kpmcore , kservice, libatasmart, libxcb, libyamlcpp, parted, polkit-qt, python, qtbase , qtquickcontrols, qtsvg, qttools, qtwebengine, utillinux, glibc, tzdata -, ckbcomp, xkeyboard_config +, ckbcomp, xkeyboard_config, mkDerivation }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "calamares"; version = "3.2.15"; @@ -54,10 +54,10 @@ stdenv.mkDerivation rec { -i CMakeLists.txt ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Distribution-independent installer framework"; license = licenses.gpl3; - maintainers = with stdenv.lib.maintainers; [ manveru ]; + maintainers = with lib.maintainers; [ manveru ]; platforms = platforms.linux; }; } -- cgit 1.4.1