diff options
author | Anton Schirg <anton.schirg@posteo.de> | 2017-07-19 02:26:38 +0200 |
---|---|---|
committer | Anton Schirg <anton.schirg@posteo.de> | 2017-07-19 02:26:38 +0200 |
commit | 29e88a59c85492e39c303078acb2375c3f2054ef (patch) | |
tree | 206e2a0f910cdd588d26ef6e06415f537ab07837 | |
parent | 0d9a0efc8880219da5abadfe2ba09c5e0ddec6d6 (diff) | |
download | nixlib-29e88a59c85492e39c303078acb2375c3f2054ef.tar nixlib-29e88a59c85492e39c303078acb2375c3f2054ef.tar.gz nixlib-29e88a59c85492e39c303078acb2375c3f2054ef.tar.bz2 nixlib-29e88a59c85492e39c303078acb2375c3f2054ef.tar.lz nixlib-29e88a59c85492e39c303078acb2375c3f2054ef.tar.xz nixlib-29e88a59c85492e39c303078acb2375c3f2054ef.tar.zst nixlib-29e88a59c85492e39c303078acb2375c3f2054ef.zip |
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
-rw-r--r-- | pkgs/applications/misc/houdini/runtime.nix | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/pkgs/applications/misc/houdini/runtime.nix b/pkgs/applications/misc/houdini/runtime.nix index bfd53ef835d8..8e89640d7dcd 100644 --- a/pkgs/applications/misc/houdini/runtime.nix +++ b/pkgs/applications/misc/houdini/runtime.nix @@ -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 ld_library_path = builtins.concatStringsSep ":" [ @@ -11,11 +11,19 @@ let xorg.libXext xorg.libX11 xorg.libXrender + xorg.libXcursor + xorg.libXfixes + xorg.libXrender + xorg.libXcomposite + xorg.libXdamage + xorg.libXtst + alsaLib fontconfig libSM libICE zlib libpng + dbus ]) ]; license_dir = "~/.config/houdini"; @@ -25,7 +33,7 @@ stdenv.mkDerivation rec { name = "houdini-runtime-${version}"; src = requireFile rec { name = "houdini-16.0.633-linux_x86_64_gcc4.8.tar.gz"; - sha256 = "1laxncwgsr4hj53bn4pn9ibv3pkrpliwxlx0558wgnhq42js3wvl"; + sha256 = "1wwm3gqmwn7xbm2qrpb4al44kzgswmsvmjndjkbqskwinxqmg9y2"; message = '' 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: @@ -50,11 +58,13 @@ stdenv.mkDerivation rec { --no-root-check \ --accept-EULA \ $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.startup 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 QT_XKB_CONFIG_ROOT="${xkeyboardconfig}/share/X11/xkb"" >> $out/houdini/sbin/app_init.sh ''; postFixup = '' INTERPRETER="$(cat "$NIX_CC"/nix-support/dynamic-linker)" |