Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 83c0498f7006
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 5a10c51acec7
Choose a head ref
  • 3 commits
  • 2 files changed
  • 1 contributor

Commits on Mar 24, 2020

  1. pantheon.wingpanel-with-indicators: fix wrapping 

    Since #81475 this caused the wrapper to be empty of entries from
wrapGAppsHook because the wrapGAppsHook function doesn't add
them anymore, and was moved to gappsWrapperArgsHook. Instead
of just running that in postBuild it's more future proof to make this
use stdenv.mkDerivation because we want to mess around with the
generic builder.
    @worldofpeace
    worldofpeace committed Mar 24, 2020
    Copy the full SHA
    db41c78 View commit details

  2. pantheon.switchboard-with-plugs: fix wrapping 

    Since #81475 this caused the wrapper to be empty of entries from
wrapGAppsHook because the wrapGAppsHook function doesn't add
them anymore, and was moved to gappsWrapperArgsHook. Instead
of just running that in postBuild it's more future proof to make this
use stdenv.mkDerivation because we want to mess around with the
generic builder.
    @worldofpeace
    worldofpeace committed Mar 24, 2020
    Copy the full SHA
    a9e7e93 View commit details

  3. Merge pull request #83265 from worldofpeace/fix-wingpanel-and-switchb… 

    …oard

Fix wingpanel and switchboard
    @worldofpeace
    worldofpeace authored Mar 24, 2020
    Copy the full SHA
    5a10c51 View commit details
Showing with 54 additions and 19 deletions.
  1. +29 −9 pkgs/desktops/pantheon/apps/switchboard/wrapper.nix
  2. +25 −10 pkgs/desktops/pantheon/desktop/wingpanel/wrapper.nix
38 changes: 29 additions & 9 deletions pkgs/desktops/pantheon/apps/switchboard/wrapper.nix
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
{ wrapGAppsHook
, glib
, lib
, symlinkJoin
, stdenv
, xorg
, switchboard
, switchboardPlugs
, plugs
@@ -14,26 +15,45 @@ let
if plugs == null then switchboardPlugs
else plugs ++ (lib.optionals useDefaultPlugs switchboardPlugs);
in
symlinkJoin {
stdenv.mkDerivation rec {
name = "${switchboard.name}-with-plugs";

src = null;

paths = [
switchboard
] ++ selectedPlugs;

buildInputs = [
wrapGAppsHook
passAsFile = [ "paths" ];

nativeBuildInputs = [
glib
] ++ (lib.forEach selectedPlugs (x: x.buildInputs))
wrapGAppsHook
];

buildInputs = lib.forEach selectedPlugs (x: x.buildInputs)
++ selectedPlugs;

postBuild = ''
make_glib_find_gsettings_schemas
dontUnpack = true;
dontConfigure = true;
dontBuild = true;

gappsWrapperArgs+=(--set SWITCHBOARD_PLUGS_PATH "$out/lib/switchboard")
preferLocalBuild = true;
allowSubstitutes = false;

wrapGAppsHook
installPhase = ''
mkdir -p $out
for i in $(cat $pathsPath); do
${xorg.lndir}/bin/lndir -silent $i $out
done
'';

preFixup = ''
gappsWrapperArgs+=(
--set SWITCHBOARD_PLUGS_PATH "$out/lib/switchboard"
)
'';

inherit (switchboard) meta;
}

35 changes: 25 additions & 10 deletions pkgs/desktops/pantheon/desktop/wingpanel/wrapper.nix
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
{ lib
, wrapGAppsHook
, glib
, symlinkJoin
, stdenv
, xorg
, wingpanel
, wingpanelIndicators
, switchboard-with-plugs
@@ -15,30 +16,44 @@ let
if indicators == null then wingpanelIndicators
else indicators ++ (lib.optionals useDefaultIndicators wingpanelIndicators);
in
symlinkJoin {
stdenv.mkDerivation rec {
name = "${wingpanel.name}-with-indicators";

src = null;

paths = [
wingpanel
] ++ selectedIndicators;

buildInputs = [
passAsFile = [ "paths" ];

nativeBuildInputs = [
glib
wrapGAppsHook
] ++ (lib.forEach selectedIndicators (x: x.buildInputs))
];

buildInputs = lib.forEach selectedIndicators (x: x.buildInputs)
++ selectedIndicators;

# We have to set SWITCHBOARD_PLUGS_PATH because wingpanel-applications-menu
# has a plugin to search switchboard settings
postBuild = ''
make_glib_find_gsettings_schemas
dontUnpack = true;
dontConfigure = true;
dontBuild = true;

preferLocalBuild = true;
allowSubstitutes = false;

installPhase = ''
mkdir -p $out
for i in $(cat $pathsPath); do
${xorg.lndir}/bin/lndir -silent $i $out
done
'';

preFixup = ''
gappsWrapperArgs+=(
--set WINGPANEL_INDICATORS_PATH "$out/lib/wingpanel"
--set SWITCHBOARD_PLUGS_PATH "${switchboard-with-plugs}/lib/switchboard"
)
wrapGAppsHook
'';

inherit (wingpanel) meta;