mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-20 12:29:02 +02:00
xfce: fix cross-compilation by using makeScopeWithSplicing
This commit is contained in:
parent
1f3ebb2bd1
commit
5568a4d25c
|
@ -1,6 +1,33 @@
|
|||
{ config, lib, pkgs }:
|
||||
{ config
|
||||
, lib
|
||||
, pkgs
|
||||
, splicePackages
|
||||
, newScope
|
||||
, pkgsBuildBuild
|
||||
, pkgsBuildHost
|
||||
, pkgsBuildTarget
|
||||
, pkgsHostHost
|
||||
, pkgsTargetTarget
|
||||
}:
|
||||
|
||||
lib.makeScope pkgs.newScope (self: with self; {
|
||||
let
|
||||
otherSplices = {
|
||||
selfBuildBuild = pkgsBuildBuild.xfce;
|
||||
selfBuildHost = pkgsBuildHost.xfce;
|
||||
selfBuildTarget = pkgsBuildTarget.xfce;
|
||||
selfHostHost = pkgsHostHost.xfce;
|
||||
selfTargetTarget = pkgsTargetTarget.xfce or {};
|
||||
};
|
||||
keep = _self: { };
|
||||
extra = _spliced0: {};
|
||||
|
||||
in lib.makeScopeWithSplicing
|
||||
splicePackages
|
||||
newScope
|
||||
otherSplices
|
||||
keep
|
||||
extra
|
||||
(self: with self; {
|
||||
#### NixOS support
|
||||
|
||||
genericUpdater = pkgs.genericUpdater;
|
||||
|
|
Loading…
Reference in a new issue