JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #38032 from romildo/deepin

Browse Source 
deepin: use libsForQt5 in meta package
This commit is contained in:
Matthew Justin Bauer 2018-04-17 09:55:21 -05:00 committed by GitHub
commit 23eac59f88
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/desktops/deepin/default.nix
View File

@ -1,14 +1,10 @@
{ pkgs, newScope }: { pkgs, makeScope, libsForQt5 }:
let let
callPackage = newScope self; packages = self: with self; {
self = rec {
deepin-gtk-theme = callPackage ./deepin-gtk-theme { }; deepin-gtk-theme = callPackage ./deepin-gtk-theme { };
deepin-icon-theme = callPackage ./deepin-icon-theme { }; deepin-icon-theme = callPackage ./deepin-icon-theme { };
deepin-terminal = callPackage ./deepin-terminal { deepin-terminal = callPackage ./deepin-terminal {
inherit (pkgs.gnome3) libgee vte; inherit (pkgs.gnome3) libgee vte;
wnck = pkgs.libwnck3; wnck = pkgs.libwnck3;
@ -16,4 +12,5 @@ let
}; };
in self in
makeScope libsForQt5.newScope packages

5
pkgs/top-level/all-packages.nix
View File

@ -19543,7 +19543,10 @@ with pkgs;
clearlooks-phenix = callPackage ../misc/themes/clearlooks-phenix { }; 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 { enlightenment = recurseIntoAttrs (callPackage ../desktops/enlightenment {
callPackage = newScope pkgs.enlightenment; callPackage = newScope pkgs.enlightenment;