uboot: (firmwareOdroidC2/C4) don't invoke patch tool, use patches = [] instead
https://github.com/NixOS/nixpkgs/blob/master/pkgs/stdenv/generic/setup.sh#L948 this can do it nicely. Signed-off-by: Anton Arapov <anton@deadbeef.mx>
This commit is contained in:
Anton Arapov
Alan Daniels
commit
56de2bcd43
30691 changed files with 3076956 additions and 0 deletions
126
pkgs/desktops/gnustep/make/GNUstep.conf
Normal file
126
pkgs/desktops/gnustep/make/GNUstep.conf
Normal file
|
|
@ -0,0 +1,126 @@
|
|||
# These GNUSTEP_*_ROOT variables are obsolete, and will be removed.
|
||||
#GNUSTEP_SYSTEM_ROOT=/nix/store/ky64z3j9l18wjcssb9pxnc792ihh3bvw-gnustep-make-2.6.6/System
|
||||
#GNUSTEP_LOCAL_ROOT=/nix/store/ky64z3j9l18wjcssb9pxnc792ihh3bvw-gnustep-make-2.6.6/Local
|
||||
#GNUSTEP_NETWORK_ROOT=/nix/store/ky64z3j9l18wjcssb9pxnc792ihh3bvw-gnustep-make-2.6.6/Network
|
||||
|
||||
# The name of the user config file. This file can override
|
||||
# some settings in this file. Usually used by users that want
|
||||
# to install things into their GNUstep user domain and/or have
|
||||
# many such domains.
|
||||
GNUSTEP_USER_CONFIG_FILE=.GNUstep.conf
|
||||
|
||||
# The name of the user directory, if any. This is obsolete,
|
||||
# and will be removed.
|
||||
GNUSTEP_USER_DIR=GNUstep
|
||||
|
||||
# The name of the user directory where defaults (eg, preferences) are
|
||||
# stored. If it does not start with a '/', it will be considered
|
||||
# relative to the user home directory.
|
||||
GNUSTEP_USER_DEFAULTS_DIR=GNUstep/Defaults
|
||||
|
||||
|
||||
# This is where the gnustep-make Makefiles are installed.
|
||||
# Traditionally, this is /usr/GNUstep/System/Library/Makefiles
|
||||
GNUSTEP_MAKEFILES=@gnustepMakefiles@
|
||||
|
||||
# This is where the user home directories are. Only used to provide
|
||||
# NSUserDirectory in gnustep-base. Never used anywhere else.
|
||||
GNUSTEP_SYSTEM_USERS_DIR=/home
|
||||
GNUSTEP_NETWORK_USERS_DIR=/home
|
||||
GNUSTEP_LOCAL_USERS_DIR=/home
|
||||
|
||||
|
||||
# This is where System GUI Applications get installed.
|
||||
# Traditionally it is /usr/GNUstep/System/Applications.
|
||||
GNUSTEP_SYSTEM_APPS=@systemApps@
|
||||
|
||||
# This is where System GUI Applications that only the
|
||||
# Administrator can use get installed.
|
||||
# Traditionally it is /usr/GNUstep/System/Applications/Admin.
|
||||
GNUSTEP_SYSTEM_ADMIN_APPS=@systemAdminApps@
|
||||
|
||||
# This is where System Web Applications (GSWeb, SOPE) get
|
||||
# installed.
|
||||
# Traditionally it is /usr/GNUstep/System/Library/WebApplications.
|
||||
GNUSTEP_SYSTEM_WEB_APPS=@systemWebApps@
|
||||
|
||||
# This is where System Command-Line Tools get installed.
|
||||
# Traditionally it is /usr/GNUstep/System/Tools.
|
||||
GNUSTEP_SYSTEM_TOOLS=@systemTools@
|
||||
|
||||
# This is where System Command-Line Tools that only the
|
||||
# Administrator can use get installed. Important: this
|
||||
# should not be in the PATH of normal users.
|
||||
# Traditionally it is /usr/GNUstep/System/Tools/Admin.
|
||||
GNUSTEP_SYSTEM_ADMIN_TOOLS=@systemAdminTools@
|
||||
|
||||
# This is where System resources get installed. This directory will
|
||||
# contain a lot of executable code since *step traditionally likes to
|
||||
# bundle executables and resources together.
|
||||
# Traditionally it is /usr/GNUstep/System/Library.
|
||||
GNUSTEP_SYSTEM_LIBRARY=@systemLibrary@
|
||||
|
||||
# This is where System headers get installed. They are the
|
||||
# library .h headers.
|
||||
# Traditionally it is /usr/GNUstep/System/Library/Headers.
|
||||
GNUSTEP_SYSTEM_HEADERS=@systemHeaders@
|
||||
|
||||
# This is where System libraries get installed. By libraries we mean
|
||||
# the shared/static object files that you can link into programs.
|
||||
# Traditionally it is /usr/GNUstep/System/Library/Libraries.
|
||||
GNUSTEP_SYSTEM_LIBRARIES=@systemLibraries@
|
||||
|
||||
# This is where System documentation get installed. This is known
|
||||
# not to contain any executable, so we keep it separate.
|
||||
# Traditionally it is /usr/GNUstep/System/Library/Documentation.
|
||||
GNUSTEP_SYSTEM_DOC=@systemDoc@
|
||||
|
||||
# This is where System man pages get installed.
|
||||
# Traditionally it is /usr/GNUstep/System/Library/Documentation/man.
|
||||
GNUSTEP_SYSTEM_DOC_MAN=@systemDocMan@
|
||||
|
||||
# This is where System info pages get installed.
|
||||
# Traditionally it is /usr/GNUstep/System/Library/Documentation/info.
|
||||
GNUSTEP_SYSTEM_DOC_INFO=@systemDocInfo@
|
||||
|
||||
|
||||
GNUSTEP_NETWORK_APPS=@systemApps@
|
||||
GNUSTEP_NETWORK_ADMIN_APPS=@systemAdminApps@
|
||||
GNUSTEP_NETWORK_WEB_APPS=@systemWebApps@
|
||||
GNUSTEP_NETWORK_TOOLS=@systemTools@
|
||||
GNUSTEP_NETWORK_ADMIN_TOOLS=@systemAdminTools@
|
||||
GNUSTEP_NETWORK_LIBRARY=@systemLibrary@
|
||||
GNUSTEP_NETWORK_HEADERS=@systemHeaders@
|
||||
GNUSTEP_NETWORK_LIBRARIES=@systemLibraries@
|
||||
GNUSTEP_NETWORK_DOC=@systemDoc@
|
||||
GNUSTEP_NETWORK_DOC_MAN=@systemDocMan@
|
||||
GNUSTEP_NETWORK_DOC_INFO=@systemDocInfo@
|
||||
|
||||
GNUSTEP_LOCAL_APPS=@systemApps@
|
||||
GNUSTEP_LOCAL_ADMIN_APPS=@systemAdminApps@
|
||||
GNUSTEP_LOCAL_WEB_APPS=@systemWebApps@
|
||||
GNUSTEP_LOCAL_TOOLS=@systemTools@
|
||||
GNUSTEP_LOCAL_ADMIN_TOOLS=@systemAdminTools@
|
||||
GNUSTEP_LOCAL_LIBRARY=@systemLibrary@
|
||||
GNUSTEP_LOCAL_HEADERS=@systemHeaders@
|
||||
GNUSTEP_LOCAL_LIBRARIES=@systemLibraries@
|
||||
GNUSTEP_LOCAL_DOC=@systemDoc@
|
||||
GNUSTEP_LOCAL_DOC_MAN=@systemDocMan@
|
||||
GNUSTEP_LOCAL_DOC_INFO=@systemDocInfo@
|
||||
|
||||
# Important: settings in the User should normally be relative paths,
|
||||
# and will be interpreted as relative to the user's directory. This
|
||||
# allows each user to have their own domain to install things. You
|
||||
# can set them to be absolute, mostly if you want to disable them
|
||||
# by setting them equal to the ones in the Network domain.
|
||||
GNUSTEP_USER_DIR_APPS=GNUstep/Applications
|
||||
GNUSTEP_USER_DIR_ADMIN_APPS=GNUstep/Applications/Admin
|
||||
GNUSTEP_USER_DIR_WEB_APPS=GNUstep/WebApplications
|
||||
GNUSTEP_USER_DIR_TOOLS=GNUstep/Tools
|
||||
GNUSTEP_USER_DIR_ADMIN_TOOLS=GNUstep/Tools/Admin
|
||||
GNUSTEP_USER_DIR_LIBRARY=GNUstep/Library
|
||||
GNUSTEP_USER_DIR_HEADERS=GNUstep/Library/Headers
|
||||
GNUSTEP_USER_DIR_LIBRARIES=GNUstep/Library/Libraries
|
||||
GNUSTEP_USER_DIR_DOC=GNUstep/Library/Documentation
|
||||
GNUSTEP_USER_DIR_DOC_MAN=GNUstep/Library/Documentation/man
|
||||
GNUSTEP_USER_DIR_DOC_INFO=GNUstep/Library/Documentation/info
|
||||
122
pkgs/desktops/gnustep/make/builder.sh
Normal file
122
pkgs/desktops/gnustep/make/builder.sh
Normal file
|
|
@ -0,0 +1,122 @@
|
|||
source $stdenv/setup
|
||||
|
||||
preConfigure() {
|
||||
. $GNUSTEP_MAKEFILES/GNUstep.sh
|
||||
}
|
||||
|
||||
wrapGSMake() {
|
||||
local program="$1"
|
||||
local config="$2"
|
||||
local wrapped="$(dirname $program)/.$(basename $program)-wrapped"
|
||||
|
||||
mv "$program" "$wrapped"
|
||||
|
||||
cat > "$program"<<EOF
|
||||
#! $SHELL -e
|
||||
|
||||
export GNUSTEP_CONFIG_FILE="$config"
|
||||
|
||||
exec "$wrapped" "\$@"
|
||||
EOF
|
||||
chmod +x "$program"
|
||||
}
|
||||
|
||||
postInstall() {
|
||||
local conf="$out/share/.GNUstep.conf"
|
||||
|
||||
mkdir -p "$out/share"
|
||||
touch $conf
|
||||
|
||||
# add the current package to the paths
|
||||
local tmp="$out/lib/GNUstep/Applications"
|
||||
if [ -d "$tmp" ] && case "$NIX_GNUSTEP_SYSTEM_APPS" in *"${tmp}"*) false;; *) true;; esac; then
|
||||
addToSearchPath NIX_GNUSTEP_SYSTEM_APPS "$tmp"
|
||||
fi
|
||||
tmp="$out/lib/GNUstep/Applications"
|
||||
if [ -d "$tmp" ] && case "$NIX_GNUSTEP_SYSTEM_ADMIN_APPS" in *"${tmp}"*) false;; *) true;; esac; then
|
||||
addToSearchPath NIX_GNUSTEP_SYSTEM_ADMIN_APPS "$tmp"
|
||||
fi
|
||||
tmp="$out/lib/GNUstep/WebApplications"
|
||||
if [ -d "$tmp" ] && case "$NIX_GNUSTEP_SYSTEM_WEB_APPS" in *"${tmp}"*) false;; *) true;; esac; then
|
||||
addToSearchPath NIX_GNUSTEP_SYSTEM_WEB_APPS "$tmp"
|
||||
fi
|
||||
tmp="$out/bin"
|
||||
if [ -d "$tmp" ] && case "$NIX_GNUSTEP_SYSTEM_TOOLS" in *"${tmp}"*) false;; *) true;; esac; then
|
||||
addToSearchPath NIX_GNUSTEP_SYSTEM_TOOLS "$tmp"
|
||||
fi
|
||||
tmp="$out/sbin"
|
||||
if [ -d "$tmp" ] && case "$NIX_GNUSTEP_SYSTEM_ADMIN_TOOLS" in *"${tmp}"*) false;; *) true;; esac; then
|
||||
addToSearchPath NIX_GNUSTEP_SYSTEM_ADMIN_TOOLS "$tmp"
|
||||
fi
|
||||
tmp="$out/lib/GNUstep"
|
||||
if [ -d "$tmp" ] && case "$NIX_GNUSTEP_SYSTEM_LIBRARY" in *"${tmp}"*) false;; *) true;; esac; then
|
||||
addToSearchPath NIX_GNUSTEP_SYSTEM_LIBRARY "$tmp"
|
||||
fi
|
||||
tmp="$out/include"
|
||||
if [ -d "$tmp" ] && case "$NIX_GNUSTEP_SYSTEM_HEADERS" in *"${tmp}"*) false;; *) true;; esac; then
|
||||
if [ -z "$NIX_GNUSTEP_SYSTEM_HEADERS" ]; then
|
||||
export NIX_GNUSTEP_SYSTEM_HEADERS="$tmp"
|
||||
else
|
||||
export NIX_GNUSTEP_SYSTEM_HEADERS+=" $tmp"
|
||||
fi
|
||||
fi
|
||||
tmp="$out/lib"
|
||||
if [ -d "$tmp" ] && case "$NIX_GNUSTEP_SYSTEM_LIBRARIES" in *"${tmp}"*) false;; *) true;; esac; then
|
||||
addToSearchPath NIX_GNUSTEP_SYSTEM_LIBRARIES "$tmp"
|
||||
fi
|
||||
tmp="$out/share/GNUstep/Documentation"
|
||||
if [ -d "$tmp" ] && case "$NIX_GNUSTEP_SYSTEM_DOC" in *"${tmp}"*) false;; *) true;; esac; then
|
||||
addToSearchPath NIX_GNUSTEP_SYSTEM_DOC "$tmp"
|
||||
fi
|
||||
tmp="$out/share/man"
|
||||
if [ -d "$tmp" ] && case "$NIX_GNUSTEP_SYSTEM_DOC_MAN" in *"${tmp}"*) false;; *) true;; esac; then
|
||||
addToSearchPath NIX_GNUSTEP_SYSTEM_DOC_MAN "$tmp"
|
||||
fi
|
||||
tmp="$out/share/info"
|
||||
if [ -d "$tmp" ] && case "$NIX_GNUSTEP_SYSTEM_DOC_INFO" in *"${tmp}"*) false;; *) true;; esac; then
|
||||
addToSearchPath NIX_GNUSTEP_SYSTEM_DOC_INFO "$tmp"
|
||||
fi
|
||||
|
||||
# write the config file
|
||||
echo GNUSTEP_MAKEFILES=$GNUSTEP_MAKEFILES >> $conf
|
||||
if [ -n "$NIX_GNUSTEP_SYSTEM_APPS" ]; then
|
||||
echo NIX_GNUSTEP_SYSTEM_APPS="$NIX_GNUSTEP_SYSTEM_APPS"
|
||||
fi
|
||||
if [ -n "$NIX_GNUSTEP_SYSTEM_ADMIN_APPS" ]; then
|
||||
echo NIX_GNUSTEP_SYSTEM_ADMIN_APPS="$NIX_GNUSTEP_SYSTEM_ADMIN_APPS" >> $conf
|
||||
fi
|
||||
if [ -n "$NIX_GNUSTEP_SYSTEM_WEB_APPS" ]; then
|
||||
echo NIX_GNUSTEP_SYSTEM_WEB_APPS="$NIX_GNUSTEP_SYSTEM_WEB_APPS" >> $conf
|
||||
fi
|
||||
if [ -n "$NIX_GNUSTEP_SYSTEM_TOOLS" ]; then
|
||||
echo NIX_GNUSTEP_SYSTEM_TOOLS="$NIX_GNUSTEP_SYSTEM_TOOLS" >> $conf
|
||||
fi
|
||||
if [ -n "$NIX_GNUSTEP_SYSTEM_ADMIN_TOOLS" ]; then
|
||||
echo NIX_GNUSTEP_SYSTEM_ADMIN_TOOLS="$NIX_GNUSTEP_SYSTEM_ADMIN_TOOLS" >> $conf
|
||||
fi
|
||||
if [ -n "$NIX_GNUSTEP_SYSTEM_LIBRARY" ]; then
|
||||
echo NIX_GNUSTEP_SYSTEM_LIBRARY="$NIX_GNUSTEP_SYSTEM_LIBRARY" >> $conf
|
||||
fi
|
||||
if [ -n "$NIX_GNUSTEP_SYSTEM_HEADERS" ]; then
|
||||
echo NIX_GNUSTEP_SYSTEM_HEADERS="$NIX_GNUSTEP_SYSTEM_HEADERS" >> $conf
|
||||
fi
|
||||
if [ -n "$NIX_GNUSTEP_SYSTEM_LIBRARIES" ]; then
|
||||
echo NIX_GNUSTEP_SYSTEM_LIBRARIES="$NIX_GNUSTEP_SYSTEM_LIBRARIES" >> $conf
|
||||
fi
|
||||
if [ -n "$NIX_GNUSTEP_SYSTEM_DOC" ]; then
|
||||
echo NIX_GNUSTEP_SYSTEM_DOC="$NIX_GNUSTEP_SYSTEM_DOC" >> $conf
|
||||
fi
|
||||
if [ -n "$NIX_GNUSTEP_SYSTEM_DOC_MAN" ]; then
|
||||
echo NIX_GNUSTEP_SYSTEM_DOC_MAN="$NIX_GNUSTEP_SYSTEM_DOC_MAN" >> $conf
|
||||
fi
|
||||
if [ -n "$NIX_GNUSTEP_SYSTEM_DOC_INFO" ]; then
|
||||
echo NIX_GNUSTEP_SYSTEM_DOC_INFO="$NIX_GNUSTEP_SYSTEM_DOC_INFO" >> $conf
|
||||
fi
|
||||
|
||||
for i in $out/bin/*; do
|
||||
echo "wrapping $(basename $i)"
|
||||
wrapGSMake "$i" "$out/share/.GNUstep.conf"
|
||||
done
|
||||
}
|
||||
|
||||
genericBuild
|
||||
36
pkgs/desktops/gnustep/make/default.nix
Normal file
36
pkgs/desktops/gnustep/make/default.nix
Normal file
|
|
@ -0,0 +1,36 @@
|
|||
{ lib, stdenv, fetchurl, clang, which, libobjc }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnustep-make";
|
||||
version = "2.9.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-make-${version}.tar.gz";
|
||||
sha256 = "sha256-oLBmwRJXh5x8hTEd6mnGf23HQe8znbZRT4W2SZLEDSo=";
|
||||
};
|
||||
|
||||
configureFlags = [
|
||||
"--with-layout=fhs-system"
|
||||
"--disable-install-p"
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
configureFlags="$configureFlags --with-config-file=$out/etc/GNUstep/GNUstep.conf"
|
||||
'';
|
||||
|
||||
makeFlags = [
|
||||
"GNUSTEP_INSTALLATION_DOMAIN=SYSTEM"
|
||||
];
|
||||
|
||||
buildInputs = [ clang which libobjc ];
|
||||
patches = [ ./fixup-paths.patch ];
|
||||
setupHook = ./setup-hook.sh;
|
||||
meta = {
|
||||
description = "A build manager for GNUstep";
|
||||
homepage = "http://gnustep.org/";
|
||||
changelog = "https://github.com/gnustep/tools-make/releases/tag/make-${builtins.replaceStrings [ "." ] [ "_" ] version}";
|
||||
license = lib.licenses.lgpl2Plus;
|
||||
maintainers = with lib.maintainers; [ ashalkhakov matthewbauer ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
197
pkgs/desktops/gnustep/make/fixup-paths.patch
Normal file
197
pkgs/desktops/gnustep/make/fixup-paths.patch
Normal file
|
|
@ -0,0 +1,197 @@
|
|||
diff -r -u gnustep-make-2.6.6/common.make gnustep-make-2.6.6.patched/common.make
|
||||
--- gnustep-make-2.6.6/common.make 2013-03-04 17:21:55.000000000 +0600
|
||||
+++ gnustep-make-2.6.6.patched/common.make 2015-01-18 14:36:25.000000000 +0600
|
||||
@@ -135,7 +135,9 @@
|
||||
endif
|
||||
# Then include makefiles with flags/config options installed by the
|
||||
# libraries themselves
|
||||
--include $(GNUSTEP_MAKEFILES)/Additional/*.make
|
||||
+ifneq ($(NIX_GNUSTEP_MAKEFILES_ADDITIONAL),)
|
||||
+include $(NIX_GNUSTEP_MAKEFILES_ADDITIONAL)
|
||||
+endif
|
||||
|
||||
#
|
||||
# Determine target specific settings
|
||||
diff -r -u gnustep-make-2.6.6/GNUmakefile.in gnustep-make-2.6.6.patched/GNUmakefile.in
|
||||
--- gnustep-make-2.6.6/GNUmakefile.in 2013-09-20 12:13:15.000000000 +0600
|
||||
+++ gnustep-make-2.6.6.patched/GNUmakefile.in 2014-12-07 20:35:27.000000000 +0600
|
||||
@@ -173,7 +173,6 @@
|
||||
"$(makedir)/$(GNUSTEP_TARGET_CPU)" \
|
||||
"$(makedir)/$(GNUSTEP_TARGET_DIR)" \
|
||||
"$(makedir)/$(GNUSTEP_TARGET_LDIR)" \
|
||||
- "$(makedir)/Additional" \
|
||||
"$(makedir)/Auxiliary" \
|
||||
"$(makedir)/Master" \
|
||||
"$(makedir)/Instance" \
|
||||
@@ -314,7 +313,6 @@
|
||||
-rmdir "$(makedir)/Instance"
|
||||
-rmdir "$(makedir)/Master"
|
||||
-rmdir "$(makedir)/Auxiliary"
|
||||
- -rmdir "$(makedir)/Additional"
|
||||
-rmdir "$(makedir)/$(GNUSTEP_TARGET_LDIR)"
|
||||
-rmdir "$(makedir)/$(GNUSTEP_TARGET_DIR)"
|
||||
-rmdir "$(makedir)/$(GNUSTEP_TARGET_CPU)"
|
||||
diff -r -u gnustep-make-2.6.6/gnustep-config.in gnustep-make-2.6.6.patched/gnustep-config.in
|
||||
--- gnustep-make-2.6.6/gnustep-config.in 2013-07-02 16:06:24.000000000 +0600
|
||||
+++ gnustep-make-2.6.6.patched/gnustep-config.in 2014-12-09 21:29:49.000000000 +0600
|
||||
@@ -66,6 +66,7 @@
|
||||
echo " --variable=OBJCXX"
|
||||
echo " --variable=GNUMAKE"
|
||||
echo " --variable=GNUSTEP_MAKEFILES"
|
||||
+ echo " --variable=NIX_GNUSTEP_MAKEFILES_ADDITIONAL"
|
||||
echo " --variable=GNUSTEP_USER_DEFAULTS_DIR"
|
||||
echo " --variable=GNUSTEP_HOST"
|
||||
echo " --variable=GNUSTEP_HOST_CPU"
|
||||
@@ -153,6 +154,8 @@
|
||||
|
||||
export GNUSTEP_MAKEFILES
|
||||
|
||||
+export NIX_GNUSTEP_MAKEFILES_ADDITIONAL
|
||||
+
|
||||
#
|
||||
# If all they want to know if GNUSTEP_MAKEFILES or anything that
|
||||
# we can compute only using GNUSTEP_MAKEFILES, we can print it out
|
||||
@@ -168,6 +171,8 @@
|
||||
exit 0;;
|
||||
--variable=GNUSTEP_MAKEFILES) echo "$GNUSTEP_MAKEFILES"
|
||||
exit 0;;
|
||||
+ --variable=NIX_GNUSTEP_MAKEFILES_ADDITIONAL) echo "$NIX_GNUSTEP_MAKEFILES_ADDITIONAL"
|
||||
+ exit 0;;
|
||||
--variable=GNUMAKE) echo "@GNUMAKE@"
|
||||
exit 0;;
|
||||
--debug-flags) @GNUMAKE@ -s -f "$GNUSTEP_MAKEFILES/empty.make" print-gnustep-make-objc-flags quiet=yes debug=yes 2>/dev/null
|
||||
Only in gnustep-make-2.6.6.patched: gnustep-config.in~
|
||||
diff -r -u gnustep-make-2.6.6/GNUstep.csh.in gnustep-make-2.6.6.patched/GNUstep.csh.in
|
||||
--- gnustep-make-2.6.6/GNUstep.csh.in 2011-05-03 13:40:10.000000000 +0600
|
||||
+++ gnustep-make-2.6.6.patched/GNUstep.csh.in 2014-12-09 20:14:05.000000000 +0600
|
||||
@@ -130,6 +130,10 @@
|
||||
setenv GNUSTEP_MAKEFILES "@GNUSTEP_MAKEFILES@"
|
||||
endif
|
||||
|
||||
+if ( ! ${?NIX_GNUSTEP_MAKEFILES_ADDITIONAL} ) then
|
||||
+ setenv NIX_GNUSTEP_MAKEFILES_ADDITIONAL "@NIX_GNUSTEP_MAKEFILES_ADDITIONAL@"
|
||||
+endif
|
||||
+
|
||||
if ( "${GNUSTEP_MAKE_STRICT_V2_MODE}" == "yes" ) then
|
||||
unsetenv GNUSTEP_USER_DIR
|
||||
unsetenv GNUSTEP_USER_ROOT
|
||||
Only in gnustep-make-2.6.6.patched: GNUstep.csh.in~
|
||||
diff -r -u gnustep-make-2.6.6/GNUstep.sh.in gnustep-make-2.6.6.patched/GNUstep.sh.in
|
||||
--- gnustep-make-2.6.6/GNUstep.sh.in 2012-02-21 20:21:38.000000000 +0600
|
||||
+++ gnustep-make-2.6.6.patched/GNUstep.sh.in 2015-01-18 14:48:09.000000000 +0600
|
||||
@@ -173,7 +173,6 @@
|
||||
fi
|
||||
export GNUSTEP_MAKEFILES
|
||||
|
||||
-
|
||||
if [ "$GNUSTEP_MAKE_STRICT_V2_MODE" = "yes" ]; then
|
||||
# Make sure this is never set in gnustep-make v2 strict mode; it
|
||||
# might have been set in the config file.
|
||||
@@ -300,7 +299,7 @@
|
||||
# for each duplicate. When there are many duplicates it's faster to
|
||||
# use print_unique_pathlist.sh first to remove them and skip the
|
||||
# echos+greps later.
|
||||
-GNUSTEP_TOOLS_PATHLIST=`$GNUSTEP_MAKEFILES/print_unique_pathlist.sh "$GNUSTEP_USER_TOOLS" "$GNUSTEP_LOCAL_TOOLS" "$GNUSTEP_NETWORK_TOOLS" "$GNUSTEP_SYSTEM_TOOLS" $fixup_paths`
|
||||
+GNUSTEP_TOOLS_PATHLIST=$NIX_GNUSTEP_SYSTEM_TOOLS
|
||||
|
||||
# Now, we check the paths in GNUSTEP_*_ADMIN_TOOLS. These paths
|
||||
# should only be used by Administrators -- normal users don't have
|
||||
@@ -313,7 +312,7 @@
|
||||
|
||||
# So we examine GNUSTEP_*_ADMIN_TOOLS; if we find any path in that
|
||||
# list that exists and that we can write to, we add it to our PATH.
|
||||
-for dir in "$GNUSTEP_SYSTEM_ADMIN_TOOLS" "$GNUSTEP_NETWORK_ADMIN_TOOLS" "$GNUSTEP_LOCAL_ADMIN_TOOLS" "$GNUSTEP_USER_ADMIN_TOOLS"; do
|
||||
+for dir in $(echo "$NIX_GNUSTEP_SYSTEM_ADMIN_TOOLS" | tr ":" "\n"); do
|
||||
if [ -d "$dir" -a -w "$dir" ]; then
|
||||
# Only add the new dir if it's not already in GNUSTEP_TOOLS_PATHLIST
|
||||
if (echo ":${GNUSTEP_TOOLS_PATHLIST}:" \
|
||||
@@ -356,7 +355,7 @@
|
||||
export PATH
|
||||
|
||||
# Determine the library paths
|
||||
-GNUSTEP_LIBRARIES_PATHLIST=`$GNUSTEP_MAKEFILES/print_unique_pathlist.sh "$GNUSTEP_USER_LIBRARIES" "$GNUSTEP_LOCAL_LIBRARIES" "$GNUSTEP_NETWORK_LIBRARIES" "$GNUSTEP_SYSTEM_LIBRARIES" $fixup_paths`
|
||||
+GNUSTEP_LIBRARIES_PATHLIST=$NIX_GNUSTEP_SYSTEM_LIBRARIES
|
||||
|
||||
old_IFS="$IFS"
|
||||
IFS=:
|
||||
@@ -486,7 +485,7 @@
|
||||
#
|
||||
# Setup Java CLASSPATH and Guile GUILE_LOAD_PATH
|
||||
#
|
||||
-GNUSTEP_LIBRARY_PATHLIST=`$GNUSTEP_MAKEFILES/print_unique_pathlist.sh "$GNUSTEP_USER_LIBRARY" "$GNUSTEP_LOCAL_LIBRARY" "$GNUSTEP_NETWORK_LIBRARY" "$GNUSTEP_SYSTEM_LIBRARY" $fixup_paths`
|
||||
+GNUSTEP_LIBRARY_PATHLIST=$NIX_GNUSTEP_SYSTEM_LIBRARY
|
||||
|
||||
old_IFS="$IFS"
|
||||
IFS=:
|
||||
@@ -526,7 +525,7 @@
|
||||
# xxx/Library/Documentation/info, are found by the info browsing
|
||||
# programs. To get this effect, we add those paths to INFOPATH.
|
||||
#
|
||||
-GNUSTEP_INFO_PATHLIST=`$GNUSTEP_MAKEFILES/print_unique_pathlist.sh "$GNUSTEP_USER_DOC_INFO" "$GNUSTEP_LOCAL_DOC_INFO" "$GNUSTEP_NETWORK_DOC_INFO" "$GNUSTEP_SYSTEM_DOC_INFO" $fixup_paths`
|
||||
+GNUSTEP_INFO_PATHLIST=$NIX_GNUSTEP_SYSTEM_DOC_INFO
|
||||
old_IFS="$IFS"
|
||||
IFS=:
|
||||
for dir in $GNUSTEP_INFO_PATHLIST; do
|
||||
@@ -559,6 +558,7 @@
|
||||
|
||||
unset GNUSTEP_KEEP_CONFIG_FILE GNUSTEP_KEEP_USER_CONFIG_FILE
|
||||
|
||||
+
|
||||
export GNUSTEP_CONFIG_FILE GNUSTEP_USER_CONFIG_FILE
|
||||
|
||||
export GNUSTEP_USER_DEFAULTS_DIR
|
||||
diff -r -u gnustep-make-2.6.6/GNUstep-strict-v2.conf.in gnustep-make-2.6.6.patched/GNUstep-strict-v2.conf.in
|
||||
--- gnustep-make-2.6.6/GNUstep-strict-v2.conf.in 2008-01-15 20:35:36.000000000 +0600
|
||||
+++ gnustep-make-2.6.6.patched/GNUstep-strict-v2.conf.in 2014-12-07 22:04:56.000000000 +0600
|
||||
@@ -47,7 +47,6 @@
|
||||
# Traditionally, this is /usr/GNUstep/System/Library/Makefiles
|
||||
GNUSTEP_MAKEFILES=@GNUSTEP_MAKEFILES@
|
||||
|
||||
-
|
||||
# This is where the user home directories are. Only used to provide
|
||||
# NSUserDirectory in gnustep-base. Never used anywhere else.
|
||||
GNUSTEP_SYSTEM_USERS_DIR=@GNUSTEP_SYSTEM_USERS_DIR@
|
||||
diff -r -u gnustep-make-2.6.6/library-combo.make gnustep-make-2.6.6.patched/library-combo.make
|
||||
--- gnustep-make-2.6.6/library-combo.make 2012-02-21 19:53:02.000000000 +0600
|
||||
+++ gnustep-make-2.6.6.patched/library-combo.make 2014-12-09 20:15:05.000000000 +0600
|
||||
@@ -142,7 +142,7 @@
|
||||
#
|
||||
# Third-party foundations not using make package
|
||||
# Our own foundation will install a base.make file into
|
||||
-# $GNUSTEP_MAKEFILES/Additional/ to set the needed flags
|
||||
+# $NIX_GNUSTEP_MAKEFILES_ADDITIONAL to set the needed flags
|
||||
#
|
||||
ifeq ($(FOUNDATION_LIB), nx)
|
||||
# -framework Foundation is used both to find headers, and to link
|
||||
@@ -166,7 +166,7 @@
|
||||
|
||||
#
|
||||
# FIXME - Ask Helge to move this inside his libFoundation, and have
|
||||
-# it installed as a $(GNUSTEP_MAKEFILES)/Additional/libFoundation.make
|
||||
+# it installed as a $(NIX_GNUSTEP_MAKEFILES_ADDITIONAL)/libFoundation.make
|
||||
#
|
||||
ifeq ($(FOUNDATION_LIB),fd)
|
||||
-include $(GNUSTEP_MAKEFILES)/libFoundation.make
|
||||
@@ -193,7 +193,7 @@
|
||||
GUI_LIBS =
|
||||
#
|
||||
# Third-party GUI libraries - our own sets its flags into
|
||||
-# $(GNUSTEP_MAKEFILES)/Additional/gui.make
|
||||
+# $(NIX_GNUSTEP_MAKEFILES_ADDITIONAL)/gui.make
|
||||
#
|
||||
ifeq ($(GUI_LIB), nx)
|
||||
GUI_DEFINE = -DNeXT_GUI_LIBRARY=1
|
||||
diff -r -u gnustep-make-2.6.6/rules.make gnustep-make-2.6.6.patched/rules.make
|
||||
--- gnustep-make-2.6.6/rules.make 2013-07-04 16:05:44.000000000 +0600
|
||||
+++ gnustep-make-2.6.6.patched/rules.make 2014-12-09 21:31:04.000000000 +0600
|
||||
@@ -667,7 +667,9 @@
|
||||
exit 1$(END_ECHO)
|
||||
endif
|
||||
|
||||
-$(GNUSTEP_MAKEFILES)/Additional/*.make: ;
|
||||
+ifneq ($(NIX_GNUSTEP_MAKEFILES_ADDITIONAL),)
|
||||
+$(NIX_GNUSTEP_MAKEFILES_ADDITIONAL): ;
|
||||
+endif
|
||||
|
||||
$(GNUSTEP_MAKEFILES)/Master/*.make: ;
|
||||
|
||||
19
pkgs/desktops/gnustep/make/gsmakeDerivation.nix
Normal file
19
pkgs/desktops/gnustep/make/gsmakeDerivation.nix
Normal file
|
|
@ -0,0 +1,19 @@
|
|||
{ lib, stdenv, make, makeWrapper, which }:
|
||||
{ buildInputs ? [], ...} @ args:
|
||||
stdenv.mkDerivation (args // {
|
||||
buildInputs = [ makeWrapper make which ] ++ buildInputs;
|
||||
|
||||
builder = ./builder.sh;
|
||||
setupHook = ./setup-hook.sh;
|
||||
|
||||
GNUSTEP_MAKEFILES = "${make}/share/GNUstep/Makefiles";
|
||||
|
||||
meta = {
|
||||
homepage = "http://gnustep.org/";
|
||||
|
||||
license = lib.licenses.lgpl2Plus;
|
||||
|
||||
maintainers = with lib.maintainers; [ ashalkhakov matthewbauer ];
|
||||
platforms = lib.platforms.linux;
|
||||
} // (if builtins.hasAttr "meta" args then args.meta else {});
|
||||
})
|
||||
77
pkgs/desktops/gnustep/make/setup-hook.sh
Normal file
77
pkgs/desktops/gnustep/make/setup-hook.sh
Normal file
|
|
@ -0,0 +1,77 @@
|
|||
# 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" \
|
||||
)
|
||||
|
||||
addEnvVars() {
|
||||
local filename
|
||||
|
||||
for filename in $1/share/GNUstep/Makefiles/Additional/*.make ; do
|
||||
if case "${NIX_GNUSTEP_MAKEFILES_ADDITIONAL-}" in *"{$filename}"*) false;; *) true;; esac; then
|
||||
export NIX_GNUSTEP_MAKEFILES_ADDITIONAL+=" $filename"
|
||||
fi
|
||||
done
|
||||
|
||||
local tmp="$1/lib/GNUstep/Applications"
|
||||
if [ -d "$tmp" ] && case "${NIX_GNUSTEP_SYSTEM_APPS-}" in *"${tmp}"*) false;; *) true;; esac; then
|
||||
addToSearchPath NIX_GNUSTEP_SYSTEM_APPS "$tmp"
|
||||
fi
|
||||
tmp="$1/lib/GNUstep/Applications"
|
||||
if [ -d "$tmp" ] && case "${NIX_GNUSTEP_SYSTEM_ADMIN_APPS-}" in *"${tmp}"*) false;; *) true;; esac; then
|
||||
addToSearchPath NIX_GNUSTEP_SYSTEM_ADMIN_APPS "$tmp"
|
||||
fi
|
||||
tmp="$1/lib/GNUstep/WebApplications"
|
||||
if [ -d "$tmp" ] && case "${NIX_GNUSTEP_SYSTEM_WEB_APPS-}" in *"${tmp}"*) false;; *) true;; esac; then
|
||||
addToSearchPath NIX_GNUSTEP_SYSTEM_WEB_APPS "$tmp"
|
||||
fi
|
||||
tmp="$1/bin"
|
||||
if [ -d "$tmp" ] && case "${NIX_GNUSTEP_SYSTEM_TOOLS-}" in *"${tmp}"*) false;; *) true;; esac; then
|
||||
addToSearchPath NIX_GNUSTEP_SYSTEM_TOOLS "$tmp"
|
||||
fi
|
||||
tmp="$1/sbin"
|
||||
if [ -d "$tmp" ] && case "${NIX_GNUSTEP_SYSTEM_ADMIN_TOOLS-}" in *"${tmp}"*) false;; *) true;; esac; then
|
||||
addToSearchPath NIX_GNUSTEP_SYSTEM_ADMIN_TOOLS "$tmp"
|
||||
fi
|
||||
tmp="$1/lib/GNUstep"
|
||||
if [ -d "$tmp" ] && case "${NIX_GNUSTEP_SYSTEM_LIBRARY-}" in *"${tmp}"*) false;; *) true;; esac; then
|
||||
addToSearchPath NIX_GNUSTEP_SYSTEM_LIBRARY "$tmp"
|
||||
fi
|
||||
tmp="$1/include"
|
||||
if [ -d "$tmp" ] && case "${NIX_GNUSTEP_SYSTEM_HEADERS-}" in *"${tmp}"*) false;; *) true;; esac; then
|
||||
if [ -z "${NIX_GNUSTEP_SYSTEM_HEADERS-}" ]; then
|
||||
export NIX_GNUSTEP_SYSTEM_HEADERS="$tmp"
|
||||
else
|
||||
export NIX_GNUSTEP_SYSTEM_HEADERS+=" $tmp"
|
||||
fi
|
||||
fi
|
||||
tmp="$1/lib"
|
||||
if [ -d "$tmp" ] && case "${NIX_GNUSTEP_SYSTEM_LIBRARIES-}" in *"${tmp}"*) false;; *) true;; esac; then
|
||||
addToSearchPath NIX_GNUSTEP_SYSTEM_LIBRARIES "$tmp"
|
||||
fi
|
||||
tmp="$1/share/GNUstep/Documentation"
|
||||
if [ -d "$tmp" ] && case "${NIX_GNUSTEP_SYSTEM_DOC-}" in *"${tmp}"*) false;; *) true;; esac; then
|
||||
addToSearchPath NIX_GNUSTEP_SYSTEM_DOC "$tmp"
|
||||
fi
|
||||
tmp="$1/share/man"
|
||||
if [ -d "$tmp" ] && case "${NIX_GNUSTEP_SYSTEM_DOC_MAN-}" in *"${tmp}"*) false;; *) true;; esac; then
|
||||
addToSearchPath NIX_GNUSTEP_SYSTEM_DOC_MAN "$tmp"
|
||||
fi
|
||||
tmp="$1/share/info"
|
||||
if [ -d "$tmp" ] && case "${NIX_GNUSTEP_SYSTEM_DOC_INFO-}" in *"${tmp}"*) false;; *) true;; esac; then
|
||||
addToSearchPath NIX_GNUSTEP_SYSTEM_DOC_INFO "$tmp"
|
||||
fi
|
||||
}
|
||||
addEnvHooks "$targetOffset" addEnvVars
|
||||
4
pkgs/desktops/gnustep/make/wrapper.sh
Normal file
4
pkgs/desktops/gnustep/make/wrapper.sh
Normal file
|
|
@ -0,0 +1,4 @@
|
|||
#!/bin/sh
|
||||
|
||||
. $GNUSTEP_MAKEFILES/GNUstep.sh
|
||||
$1
|
||||
Loading…
Add table
Add a link
Reference in a new issue