diff options
| author | Sergei Trofimovich <slyich@gmail.com> | 2022-12-28 09:35:37 +0000 |
|---|---|---|
| committer | Sergei Trofimovich <slyich@gmail.com> | 2022-12-28 09:35:37 +0000 |
| commit | 092d57c07692d117e70f8e6ecbb65b241fc0060e (patch) | |
| tree | 35bbf470378036fce5ee3f89b940dafd0676774f /pkgs/desktops/gnustep | |
| parent | 64a3a91ef4f3880cc0b74e33852602e6a0759e6a (diff) | |
| parent | 8fb6009616e0e6a00e74076b95c3c92e0769a193 (diff) | |
| download | nixpkgs-092d57c07692d117e70f8e6ecbb65b241fc0060e.tar nixpkgs-092d57c07692d117e70f8e6ecbb65b241fc0060e.tar.gz nixpkgs-092d57c07692d117e70f8e6ecbb65b241fc0060e.tar.bz2 nixpkgs-092d57c07692d117e70f8e6ecbb65b241fc0060e.tar.lz nixpkgs-092d57c07692d117e70f8e6ecbb65b241fc0060e.tar.xz nixpkgs-092d57c07692d117e70f8e6ecbb65b241fc0060e.tar.zst nixpkgs-092d57c07692d117e70f8e6ecbb65b241fc0060e.zip | |
Merge remote-tracking branch 'origin/staging-next' into staging
Conflicts:
pkgs/development/tools/language-servers/ansible-language-server/default.nix
Diffstat (limited to 'pkgs/desktops/gnustep')
| -rw-r--r-- | pkgs/desktops/gnustep/base/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/desktops/gnustep/make/setup-hook.sh | 32 |
2 files changed, 19 insertions, 14 deletions
diff --git a/pkgs/desktops/gnustep/base/default.nix b/pkgs/desktops/gnustep/base/default.nix index 7c6127a830b..78c9bdd0aee 100644 --- a/pkgs/desktops/gnustep/base/default.nix +++ b/pkgs/desktops/gnustep/base/default.nix @@ -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 diff --git a/pkgs/desktops/gnustep/make/setup-hook.sh b/pkgs/desktops/gnustep/make/setup-hook.sh index 177a381100a..83adfefc10c 100644 --- a/pkgs/desktops/gnustep/make/setup-hook.sh +++ b/pkgs/desktops/gnustep/make/setup-hook.sh @@ -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 |