Commit 7484b304 authored by OPNA2608's avatar OPNA2608
Browse files

imake: Fix missing preInstall code 

The builder.sh would previously source a specified x11BuildHook. Now that imake was pulled out from the big xorg code, there's nothing to actually handle a set x11BuildHook.

In imake's case, this hook added code to preInstall to symlink some config and template files from xorg-cf-files. This was causing x11_ssh_askpass to FTBFS.

Drop the separate file & x11BuildHook attribute, and put its code into the package file proper.
parent e861cf9b

pkgs/by-name/im/imake/package.nix

+5 −1
Original line number Diff line number Diff line
@@ -55,9 +55,13 @@ stdenv.mkDerivation (finalAttrs: { 
    }\"'";

  };



  preInstall = ''

    mkdir -p $out/lib/X11/config

    ln -s ${xorg-cf-files}/lib/X11/config/* $out/lib/X11/config

  '';



  inherit tradcpp xorg-cf-files;

  setupHook = ./setup-hook.sh;

  x11BuildHook = ./x11-build-hook.sh;



  passthru = {

    updateScript = writeScript "update-${finalAttrs.pname}" ''

pkgs/by-name/im/imake/x11-build-hook.sh

deleted100644 → 0
+0 −6
Original line number Diff line number Diff line 
preInstall() {

    mkdir -p $out/lib/X11/config

    ln -s $xorgcffiles/lib/X11/config/* $out/lib/X11/config

    #touch $out/lib/X11/config/host.def # !!! hack

    #touch $out/lib/X11/config/date.def # !!! hack

}