public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

imake: add setup hook

This commit is contained in:
Matthew Bauer 2018-11-27 19:48:07 -06:00
parent 801b375925
commit 613e262fc2
3 changed files with 23 additions and 5 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
View File

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

19
pkgs/servers/x11/xorg/imake-setup-hook.sh Normal file
View File

@ -0,0 +1,19 @@
export IMAKECPP="@tradcpp@/bin/tradcpp"
imakeConfigurePhase() {
runHook preConfigure
echoCmd 'configuring with imake'
if [ -z "${imakefile:-}" -a ! -e Imakefile ]; then
echo "no Imakefile, doing nothing"
else
xmkmf -a
fi
runHook postConfigure
}
if [ -z "$dontUseImakeConfigure" -a -z "$configurePhase" ]; then
configurePhase=imakeConfigurePhase
fi

8
pkgs/servers/x11/xorg/overrides.nix
View File

@ -63,12 +63,12 @@ self: super:
inherit (self) xorgcffiles;
x11BuildHook = ./imake.sh;
patches = [./imake.patch ./imake-cc-wrapper-uberhack.patch];
setupHook = if stdenv.isDarwin then ./darwin-imake-setup-hook.sh else null;
CFLAGS = [ "-DIMAKE_COMPILETIME_CPP=\\\"${if stdenv.isDarwin
setupHook = ./imake-setup-hook.sh;
CFLAGS = [ ''-DIMAKE_COMPILETIME_CPP='"${if stdenv.isDarwin
then "${tradcpp}/bin/cpp"
else "gcc"}\\\""
else "gcc"}"' ''
];
tradcpp = if stdenv.isDarwin then tradcpp else null;
inherit tradcpp;
});
mkfontdir = super.mkfontdir.overrideAttrs (attrs: {