mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-20 04:31:52 +00:00
Code Issues Wiki Activity

Fix imake on darwin.

Browse source 
Taken from joelteon/nixpkgs@6b3f7e6fb0

Original author Mike Sperber <sperber@deinprogramm.de>
This commit is contained in:
Shea Levy 2015-02-04 10:00:50 +00:00
parent b611e3fb61
commit df430ab2ea
4 changed files with 19 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
pkgs/servers/x11/xorg/darwin-imake-setup-hook.sh Normal file
View file

@ -0,0 +1 @@
export IMAKECPP="@tradcpp@/bin/tradcpp"

22
pkgs/servers/x11/xorg/imake.patch
View file

@ -1,15 +1,15 @@
diff -ru -x '*~' imake-1.0.3-orig/imake.c imake-1.0.3/imake.c
--- imake-1.0.3-orig/imake.c 2009-10-16 23:45:43.000000000 +0200
+++ imake-1.0.3/imake.c 2010-07-19 12:17:12.000000000 +0200
@@ -1035,6 +1035,7 @@
diff -Naur imake-1.0.7-orig/imake.c imake-1.0.7/imake.c
--- imake-1.0.7-orig/imake.c 2013-08-17 10:11:50.000000000 +0000
+++ imake-1.0.7/imake.c 2015-02-04 09:41:59.000000000 +0000
@@ -1045,6 +1045,7 @@
static void
get_distrib(FILE *inFile)
{
+#if 0
struct stat sb;
static char* suse = "/etc/SuSE-release";
@@ -1080,6 +1081,7 @@
static const char* suse = "/etc/SuSE-release";
@@ -1090,6 +1091,7 @@
* at the content of /etc/debian_version */
return;
}
@ -17,21 +17,21 @@ diff -ru -x '*~' imake-1.0.3-orig/imake.c imake-1.0.3/imake.c
/* what's the definitive way to tell what any particular distribution is? */
fprintf (inFile, "%s\n", "#define DefaultLinuxDistribution LinuxUnknown");
@@ -1328,6 +1330,7 @@
@@ -1337,6 +1339,7 @@
static boolean
get_gcc(char *cmd)
{
+#if 0
struct stat sb;
static char* gcc_path[] = {
static const char* gcc_path[] = {
#if defined(linux) || \
@@ -1376,6 +1379,9 @@
@@ -1385,6 +1388,9 @@
}
}
return FALSE;
+#endif
+ strcpy (cmd, "gcc");
+ strcpy (cmd, IMAKE_COMPILETIME_CPP);
+ return TRUE;
}
#if defined CROSSCOMPILE || !defined __UNIXOS2__
#ifdef CROSSCOMPILE

6
pkgs/servers/x11/xorg/overrides.nix
View file

@ -49,6 +49,12 @@ in
inherit (xorg) xorgcffiles;
x11BuildHook = ./imake.sh;
patches = [./imake.patch];
setupHook = if stdenv.isDarwin then ./darwin-imake-setup-hook.sh else null;
CFLAGS = [ "-DIMAKE_COMPILETIME_CPP=\\\"${if stdenv.isDarwin
then "${args.tradcpp}/bin/cpp"
else "gcc"}\\\""
];
tradcpp = if stdenv.isDarwin then args.tradcpp else null;
};
mkfontdir = attrs: attrs // {

2
pkgs/top-level/all-packages.nix
View file

@ -8191,7 +8191,7 @@ let
xorg = recurseIntoAttrs (import ../servers/x11/xorg/default.nix {
inherit clangStdenv fetchurl fetchgit fetchpatch stdenv pkgconfig intltool freetype fontconfig
libxslt expat libpng zlib perl mesa_drivers spice_protocol
dbus libuuid openssl gperf m4 libevdev
dbus libuuid openssl gperf m4 libevdev tradcpp
autoconf automake libtool xmlto asciidoc flex bison python mtdev pixman;
mesa = mesa_noglu;
udev = if stdenv.isLinux then udev else null;