4 Commits

Author	SHA1	Message	Date
Sergei Trofimovich	6073831a11	imake: do not skip Linux* vendor definitions ... Initial build failure is onserved on `staging` branch: ``` $ nix-build -A transfig ... make[1]: Entering directory '/build/transfig.3.2.4' Imakefile.c:20:2: Include file Imake.tmpl not found imake: Exit code 1. Stop. ``` This happened after 8675ca0 ("xorg.xorgcffiles: 1.0.6 -> 1.0.7") bump which exposed an old bug in `imake.patch`. `imake.patch` dropped by accident definiton of `LinuxRedHat` enum and changed evaluation of the following code: ``` #if LinuxDistribution == LinuxRedHat ... # define ProjectRoot /usr #endif ``` References to `/usr` were addded in d47131ed97. Before this change `LinuxDistribution == LinuxRedHat` evaluated to true. After this change `LinuxDistribution == LinuxRedHat` evaluates to false. Mechanically I moved `#if 0` right after enum definitions but still before system autodetection. Now `transfig` builds successfully. Closes: https://github.com/NixOS/nixpkgs/issues/135337 Signed-off-by: Sergei Trofimovich <slyich@gmail.com>	2021-09-06 07:46:13 +01:00
Shea Levy	df430ab2ea	Fix imake on darwin. ... Taken from joelteon/nixpkgs@6b3f7e6fb0 Original author Mike Sperber <sperber@deinprogramm.de>	2015-02-04 10:00:50 +00:00
Eelco Dolstra	5ebeb68c72	* Update the imake patch. ... svn path=/nixpkgs/branches/x-updates/; revision=22660	2010-07-19 10:18:06 +00:00
Eelco Dolstra	7dba8848ed	* Fix a horrible in imake: its results depend on whether a C compiler ... exists in one of a fixed set of paths (e.g., /usr/bin/cc). For instance, on a system without /usr/bin/cc the variable DependCmd would evaluate to "makedepend", and on a system with it, to "gccmakedep". Solution: just use "gcc" always. Also disabled some shitty code to detect the current Linux distribution (by probing for files like /etc/SuSE-release). svn path=/nixpkgs/trunk/; revision=4534	2006-01-11 00:21:52 +00:00