1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-19 17:39:34 +00:00
nixpkgs/pkgs
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
..
applications xcruiser: explicitly set LIBDIR and CONFDIR 2021-09-06 07:46:13 +01:00
build-support
common-updater
data
desktops
development Merge master into staging-next 2021-09-06 06:01:23 +00:00
games
misc Merge master into staging-next 2021-09-05 18:00:57 +00:00
os-specific Merge master into staging-next 2021-09-06 00:01:28 +00:00
pkgs-lib
servers imake: do not skip Linux* vendor definitions 2021-09-06 07:46:13 +01:00
shells
stdenv
test
tools xvkbd: explicitly set LIBDIR and CONFDIR 2021-09-06 07:46:13 +01:00
top-level Merge master into staging-next 2021-09-06 00:01:28 +00:00