houdini: change sha256, add missing libs, fix license dir patch, fix keyboard input

- Changed sha256 of src file, as this was apparantly changed on the
website

- Added missing libs: some X libs, alsa, dbus

- Changed patch to $out/houdini/Licensing.opt
localValidatorDir = ... was commented out in original file
so sed had no effect

- add export QT_XKB_CONFIG_ROOT
Without it only modifier keys worked, no text input
This commit is contained in:
Anton Schirg 2017-07-19 02:26:38 +02:00
parent 0d9a0efc88
commit 29e88a59c8

View File

@ -1,4 +1,4 @@
{ stdenv, requireFile, zlib, libpng, libSM, libICE, fontconfig, xorg, mesa_glu, bc }: { stdenv, requireFile, zlib, libpng, libSM, libICE, fontconfig, xorg, mesa_glu, alsaLib, dbus, xkeyboardconfig, bc }:
let let
ld_library_path = builtins.concatStringsSep ":" [ ld_library_path = builtins.concatStringsSep ":" [
@ -11,11 +11,19 @@ let
xorg.libXext xorg.libXext
xorg.libX11 xorg.libX11
xorg.libXrender xorg.libXrender
xorg.libXcursor
xorg.libXfixes
xorg.libXrender
xorg.libXcomposite
xorg.libXdamage
xorg.libXtst
alsaLib
fontconfig fontconfig
libSM libSM
libICE libICE
zlib zlib
libpng libpng
dbus
]) ])
]; ];
license_dir = "~/.config/houdini"; license_dir = "~/.config/houdini";
@ -25,7 +33,7 @@ stdenv.mkDerivation rec {
name = "houdini-runtime-${version}"; name = "houdini-runtime-${version}";
src = requireFile rec { src = requireFile rec {
name = "houdini-16.0.633-linux_x86_64_gcc4.8.tar.gz"; name = "houdini-16.0.633-linux_x86_64_gcc4.8.tar.gz";
sha256 = "1laxncwgsr4hj53bn4pn9ibv3pkrpliwxlx0558wgnhq42js3wvl"; sha256 = "1wwm3gqmwn7xbm2qrpb4al44kzgswmsvmjndjkbqskwinxqmg9y2";
message = '' message = ''
This nix expression requires that ${name} is already part of the store. This nix expression requires that ${name} is already part of the store.
Download it from https://sidefx.com and add it to the nix store with: Download it from https://sidefx.com and add it to the nix store with:
@ -50,11 +58,13 @@ stdenv.mkDerivation rec {
--no-root-check \ --no-root-check \
--accept-EULA \ --accept-EULA \
$out $out
sed -i "s|/usr/lib/sesi|${license_dir}|g" $out/houdini/Licensing.opt echo -e "localValidatorDir = ${license_dir}\nlicensingMode = localValidator" > $out/houdini/Licensing.opt
sed -i "s|/usr/lib/sesi|${license_dir}|g" $out/houdini/sbin/sesinetd_safe sed -i "s|/usr/lib/sesi|${license_dir}|g" $out/houdini/sbin/sesinetd_safe
sed -i "s|/usr/lib/sesi|${license_dir}|g" $out/houdini/sbin/sesinetd.startup sed -i "s|/usr/lib/sesi|${license_dir}|g" $out/houdini/sbin/sesinetd.startup
echo "export LD_LIBRARY_PATH=${ld_library_path}" >> $out/bin/app_init.sh echo "export LD_LIBRARY_PATH=${ld_library_path}" >> $out/bin/app_init.sh
echo "export QT_XKB_CONFIG_ROOT="${xkeyboardconfig}/share/X11/xkb"" >> $out/bin/app_init.sh
echo "export LD_LIBRARY_PATH=${ld_library_path}" >> $out/houdini/sbin/app_init.sh echo "export LD_LIBRARY_PATH=${ld_library_path}" >> $out/houdini/sbin/app_init.sh
echo "export QT_XKB_CONFIG_ROOT="${xkeyboardconfig}/share/X11/xkb"" >> $out/houdini/sbin/app_init.sh
''; '';
postFixup = '' postFixup = ''
INTERPRETER="$(cat "$NIX_CC"/nix-support/dynamic-linker)" INTERPRETER="$(cat "$NIX_CC"/nix-support/dynamic-linker)"