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

Merge pull request #207443 from Artturin/gnustepmultiple

Browse source
This commit is contained in:
Artturi 2022-12-27 16:02:43 +02:00 committed by GitHub
parent ea1b181023 d78711a3e1
commit 52bf0b7dc0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 20 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
pkgs/desktops/gnustep/base/default.nix
View file

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

32
pkgs/desktops/gnustep/make/setup-hook.sh
View file

@ -1,20 +1,24 @@
# 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

2
pkgs/servers/web-apps/sogo/default.nix
View file

@ -51,7 +51,7 @@ gnustep.stdenv.mkDerivation rec {
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/