From e234174739907c2a86a15367702654db366614a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Sun, 4 Mar 2018 11:01:14 -0300 Subject: [PATCH] deepin: use libsForQt5 in meta package --- pkgs/desktops/deepin/default.nix | 11 ++++------- pkgs/top-level/all-packages.nix | 5 ++++- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix index b03349ce2df..2070e7bc77f 100644 --- a/pkgs/desktops/deepin/default.nix +++ b/pkgs/desktops/deepin/default.nix @@ -1,14 +1,10 @@ -{ pkgs, newScope }: +{ pkgs, makeScope, libsForQt5 }: let - callPackage = newScope self; - - self = rec { + packages = self: with self; { deepin-gtk-theme = callPackage ./deepin-gtk-theme { }; - deepin-icon-theme = callPackage ./deepin-icon-theme { }; - deepin-terminal = callPackage ./deepin-terminal { inherit (pkgs.gnome3) libgee vte; wnck = pkgs.libwnck3; @@ -16,4 +12,5 @@ let }; -in self +in + makeScope libsForQt5.newScope packages diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 79d4289d26c..dbf1858c77a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19214,7 +19214,10 @@ with pkgs; clearlooks-phenix = callPackage ../misc/themes/clearlooks-phenix { }; - deepin = recurseIntoAttrs (callPackage ../desktops/deepin { }); + deepin = recurseIntoAttrs (import ../desktops/deepin { + inherit pkgs libsForQt5; + inherit (lib) makeScope; + }); enlightenment = recurseIntoAttrs (callPackage ../desktops/enlightenment { callPackage = newScope pkgs.enlightenment;