b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #199769 from Artturin/xfcesplicingcross

Browse source 
xfce: fix cross-compilation by using makeScopeWithSplicing
This commit is contained in:
Artturi 2022-11-08 21:30:16 +02:00 committed by GitHub
parent 0ab419f97a d16405fb97
commit 3aa5166ab4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 127 additions and 95 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
pkgs/desktops/xfce/default.nix
View file

@ -1,6 +1,38 @@
{ 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:
let
inherit (self) callPackage;
in
{
#### NixOS support #### NixOS support
genericUpdater = pkgs.genericUpdater; genericUpdater = pkgs.genericUpdater;
@ -50,7 +82,7 @@ lib.makeScope pkgs.newScope (self: with self; {
xfce4-appfinder = callPackage ./core/xfce4-appfinder { }; xfce4-appfinder = callPackage ./core/xfce4-appfinder { };
xfce4-dev-tools = callPackage ./core/xfce4-dev-tools { xfce4-dev-tools = callPackage ./core/xfce4-dev-tools {
mkXfceDerivation = mkXfceDerivation.override { mkXfceDerivation = self.mkXfceDerivation.override {
xfce4-dev-tools = null; xfce4-dev-tools = null;
}; };
}; };
@ -156,9 +188,9 @@ lib.makeScope pkgs.newScope (self: with self; {
} // lib.optionalAttrs config.allowAliases { } // lib.optionalAttrs config.allowAliases {
#### ALIASES #### ALIASES
xinitrc = xfce4-session.xinitrc; # added 2019-11-04 xinitrc = self.xfce4-session.xinitrc; # added 2019-11-04
thunar-bare = thunar.override { thunarPlugins = []; }; # added 2019-11-04 thunar-bare = self.thunar.override { thunarPlugins = [ ]; }; # added 2019-11-04
}) // lib.optionalAttrs config.allowAliases { }) // lib.optionalAttrs config.allowAliases {
#### Legacy aliases. They need to be outside the scope or they will shadow the attributes from parent scope. #### Legacy aliases. They need to be outside the scope or they will shadow the attributes from parent scope.