diff --git a/pkgs/applications/misc/houdini/default.nix b/pkgs/applications/misc/houdini/default.nix index 4e40230108bb..0b679617243d 100644 --- a/pkgs/applications/misc/houdini/default.nix +++ b/pkgs/applications/misc/houdini/default.nix @@ -1,10 +1,9 @@ { zsh, stdenv, callPackage, buildFHSUserEnv, undaemonize }: let - version = "16.0.633"; houdini-runtime = callPackage ./runtime.nix { }; in buildFHSUserEnv rec { - name = "houdini-${version}"; + name = "houdini-${houdini-runtime.version}"; extraBuildCommands = '' mkdir -p $out/usr/lib/sesi diff --git a/pkgs/applications/misc/houdini/runtime.nix b/pkgs/applications/misc/houdini/runtime.nix index bfd53ef835d8..3a91d27fc48c 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,21 +11,29 @@ 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"; in stdenv.mkDerivation rec { - version = "16.0.633"; + version = "16.0.671"; name = "houdini-runtime-${version}"; src = requireFile rec { - name = "houdini-16.0.633-linux_x86_64_gcc4.8.tar.gz"; - sha256 = "1laxncwgsr4hj53bn4pn9ibv3pkrpliwxlx0558wgnhq42js3wvl"; + name = "houdini-${version}-linux_x86_64_gcc4.8.tar.gz"; + sha256 = "1d3c1a1128szlgaf3ilw5y20plz5azwp37v0ljawgm80y64hq15r"; 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)"