pyrox.dev
Merge pull request #27480 from antonxy/houdini
houdini: change sha256, add missing libs, fix license dir patch, fix …
authored by Jörg Thalheim and committed by GitHub 9f4750d9 b1bff52a
+1
-2
pkgs/applications/misc/houdini/default.nix
+1
-2
pkgs/applications/misc/houdini/default.nix
···
1
1
{ zsh, stdenv, callPackage, buildFHSUserEnv, undaemonize }:
2
2
3
3
let
4
-
version = "16.0.633";
5
4
houdini-runtime = callPackage ./runtime.nix { };
6
5
in buildFHSUserEnv rec {
7
-
name = "houdini-${version}";
6
+
name = "houdini-${houdini-runtime.version}";
8
7
9
8
extraBuildCommands = ''
10
9
mkdir -p $out/usr/lib/sesi
+15
-5
pkgs/applications/misc/houdini/runtime.nix
+15
-5
pkgs/applications/misc/houdini/runtime.nix
···
1
-
{ stdenv, requireFile, zlib, libpng, libSM, libICE, fontconfig, xorg, mesa_glu, bc }:
1
+
{ stdenv, requireFile, zlib, libpng, libSM, libICE, fontconfig, xorg, mesa_glu, alsaLib, dbus, xkeyboardconfig, bc }:
2
2
3
3
let
4
4
ld_library_path = builtins.concatStringsSep ":" [
···
11
11
xorg.libXext
12
12
xorg.libX11
13
13
xorg.libXrender
14
+
xorg.libXcursor
15
+
xorg.libXfixes
16
+
xorg.libXrender
17
+
xorg.libXcomposite
18
+
xorg.libXdamage
19
+
xorg.libXtst
20
+
alsaLib
14
21
fontconfig
15
22
libSM
16
23
libICE
17
24
zlib
18
25
libpng
26
+
dbus
19
27
])
20
28
];
21
29
license_dir = "~/.config/houdini";
22
30
in
23
31
stdenv.mkDerivation rec {
24
-
version = "16.0.633";
32
+
version = "16.0.671";
25
33
name = "houdini-runtime-${version}";
26
34
src = requireFile rec {
27
-
name = "houdini-16.0.633-linux_x86_64_gcc4.8.tar.gz";
28
-
sha256 = "1laxncwgsr4hj53bn4pn9ibv3pkrpliwxlx0558wgnhq42js3wvl";
35
+
name = "houdini-${version}-linux_x86_64_gcc4.8.tar.gz";
36
+
sha256 = "1d3c1a1128szlgaf3ilw5y20plz5azwp37v0ljawgm80y64hq15r";
29
37
message = ''
30
38
This nix expression requires that ${name} is already part of the store.
31
39
Download it from https://sidefx.com and add it to the nix store with:
···
50
58
--no-root-check \
51
59
--accept-EULA \
52
60
$out
53
-
sed -i "s|/usr/lib/sesi|${license_dir}|g" $out/houdini/Licensing.opt
61
+
echo -e "localValidatorDir = ${license_dir}\nlicensingMode = localValidator" > $out/houdini/Licensing.opt
54
62
sed -i "s|/usr/lib/sesi|${license_dir}|g" $out/houdini/sbin/sesinetd_safe
55
63
sed -i "s|/usr/lib/sesi|${license_dir}|g" $out/houdini/sbin/sesinetd.startup
56
64
echo "export LD_LIBRARY_PATH=${ld_library_path}" >> $out/bin/app_init.sh
65
+
echo "export QT_XKB_CONFIG_ROOT="${xkeyboardconfig}/share/X11/xkb"" >> $out/bin/app_init.sh
57
66
echo "export LD_LIBRARY_PATH=${ld_library_path}" >> $out/houdini/sbin/app_init.sh
67
+
echo "export QT_XKB_CONFIG_ROOT="${xkeyboardconfig}/share/X11/xkb"" >> $out/houdini/sbin/app_init.sh
58
68
'';
59
69
postFixup = ''
60
70
INTERPRETER="$(cat "$NIX_CC"/nix-support/dynamic-linker)"