pantheon: use structuredAttrs instead of passAsFile (#551482)

This commit is contained in:
Colin
2026-08-18 17:47:44 +00:00
committed by GitHub
2 changed files with 6 additions and 6 deletions

View File

@@ -32,8 +32,6 @@ stdenv.mkDerivation {
]
++ selectedPlugs;
passAsFile = [ "paths" ];
nativeBuildInputs = [
glib
lndir
@@ -52,7 +50,7 @@ stdenv.mkDerivation {
installPhase = ''
mkdir -p $out
for i in $(cat $pathsPath); do
for i in "''${paths[@]}"; do
lndir -silent $i $out
done
@@ -68,5 +66,7 @@ stdenv.mkDerivation {
)
'';
__structuredAttrs = true;
inherit (switchboard) meta;
}

View File

@@ -30,8 +30,6 @@ stdenv.mkDerivation {
]
++ selectedIndicators;
passAsFile = [ "paths" ];
nativeBuildInputs = [
glib
wrapGAppsHook3
@@ -48,7 +46,7 @@ stdenv.mkDerivation {
installPhase = ''
mkdir -p $out
for i in $(cat $pathsPath); do
for i in "''${paths[@]}"; do
${lndir}/bin/lndir -silent $i $out
done
'';
@@ -60,5 +58,7 @@ stdenv.mkDerivation {
)
'';
__structuredAttrs = true;
inherit (wingpanel) meta;
}