diff --git a/pkgs/desktops/pantheon/apps/switchboard/wrapper.nix b/pkgs/desktops/pantheon/apps/switchboard/wrapper.nix
index 1bcb7cd0d9cb..f95d1cdb63cd 100644
--- a/pkgs/desktops/pantheon/apps/switchboard/wrapper.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard/wrapper.nix
@@ -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;
 }
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel/wrapper.nix b/pkgs/desktops/pantheon/desktop/wingpanel/wrapper.nix
index 8bdbbffac072..5a88f9eee19f 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel/wrapper.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel/wrapper.nix
@@ -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;
 }