Merge pull request #207443 from Artturin/gnustepmultiple

pkgs/desktops/gnustep/base/default.nix

···
     url = "ftp://ftp.gnustep.org/pub/gnustep/core/${pname}-${version}.tar.gz";
     sha256 = "05vjz19v1w7yb7hm8qrc41bqh6xd8in7sgg2p0h1vldyyaa5sh90";
   };
+  outputs = [ "out" "dev" "lib" ];
   nativeBuildInputs = [ pkg-config ];
   propagatedBuildInputs = [
     aspell audiofile

pkgs/desktops/gnustep/make/setup-hook.sh

···
 # this path is used by some packages to install additional makefiles
 export DESTDIR_GNUSTEP_MAKEFILES=$out/share/GNUstep/Makefiles
 
-installFlagsArray=( \
-  "GNUSTEP_INSTALLATION_DOMAIN=SYSTEM" \
-  "GNUSTEP_SYSTEM_APPS=$out/lib/GNUstep/Applications" \
-  "GNUSTEP_SYSTEM_ADMIN_APPS=$out/lib/GNUstep/Applications" \
-  "GNUSTEP_SYSTEM_WEB_APPS=$out/lib/GNUstep/WebApplications" \
-  "GNUSTEP_SYSTEM_TOOLS=$out/bin" \
-  "GNUSTEP_SYSTEM_ADMIN_TOOLS=$out/sbin" \
-  "GNUSTEP_SYSTEM_LIBRARY=$out/lib/GNUstep" \
-  "GNUSTEP_SYSTEM_HEADERS=$out/include" \
-  "GNUSTEP_SYSTEM_LIBRARIES=$out/lib" \
-  "GNUSTEP_SYSTEM_DOC=$out/share/GNUstep/Documentation" \
-  "GNUSTEP_SYSTEM_DOC_MAN=$out/share/man" \
-  "GNUSTEP_SYSTEM_DOC_INFO=$out/share/info" \
-)
+addGnustepInstallFlags() {
+    installFlagsArray=( \
+      "GNUSTEP_INSTALLATION_DOMAIN=SYSTEM" \
+      "GNUSTEP_SYSTEM_APPS=${!outputLib}/lib/GNUstep/Applications" \
+      "GNUSTEP_SYSTEM_ADMIN_APPS=${!outputLib}/lib/GNUstep/Applications" \
+      "GNUSTEP_SYSTEM_WEB_APPS=${!outputLib}/lib/GNUstep/WebApplications" \
+      "GNUSTEP_SYSTEM_TOOLS=${!outputBin}/bin" \
+      "GNUSTEP_SYSTEM_ADMIN_TOOLS=${!outputBin}/sbin" \
+      "GNUSTEP_SYSTEM_LIBRARY=${!outputLib}/lib/GNUstep" \
+      "GNUSTEP_SYSTEM_HEADERS=${!outputInclude}/include" \
+      "GNUSTEP_SYSTEM_LIBRARIES=${!outputLib}/lib" \
+      "GNUSTEP_SYSTEM_DOC=${!outputDoc}/share/GNUstep/Documentation" \
+      "GNUSTEP_SYSTEM_DOC_MAN=${!outputMan}/share/man" \
+      "GNUSTEP_SYSTEM_DOC_INFO=${!outputInfo}/share/info" \
+    )
+}
+
+preInstallPhases+=" addGnustepInstallFlags"
 
 addEnvVars() {
     local filename

pkgs/servers/web-apps/sogo/default.nix

···
     sed -i "s:${gnustep.make}:$out:g" $out/share/GNUstep/GNUstep.conf
 
     # Link in GNUstep base
-    ${lndir}/bin/lndir ${gnustep.base}/lib/GNUstep/ $out/lib/GNUstep/
+    ${lndir}/bin/lndir ${lib.getLib gnustep.base}/lib/GNUstep/ $out/lib/GNUstep/
 
     # Link in sope
     ${lndir}/bin/lndir ${sope}/ $out/