public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #27480 from antonxy/houdini 

houdini: change sha256, add missing libs, fix license dir patch, fix …
This commit is contained in:
Jörg Thalheim 2017-07-22 10:06:48 +01:00 committed by GitHub
parent b1bff52a5c c4ea2d0b47
commit 9f4750d930
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/applications/misc/houdini/default.nix
View File

@ -1,10 +1,9 @@
{ zsh, stdenv, callPackage, buildFHSUserEnv, undaemonize }: { zsh, stdenv, callPackage, buildFHSUserEnv, undaemonize }:
let let
version = "16.0.633";
houdini-runtime = callPackage ./runtime.nix { }; houdini-runtime = callPackage ./runtime.nix { };
in buildFHSUserEnv rec { in buildFHSUserEnv rec {
name = "houdini-${version}"; name = "houdini-${houdini-runtime.version}";
extraBuildCommands = '' extraBuildCommands = ''
mkdir -p $out/usr/lib/sesi mkdir -p $out/usr/lib/sesi

20
pkgs/applications/misc/houdini/runtime.nix
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,21 +11,29 @@ 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";
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "16.0.633"; version = "16.0.671";
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-${version}-linux_x86_64_gcc4.8.tar.gz";
sha256 = "1laxncwgsr4hj53bn4pn9ibv3pkrpliwxlx0558wgnhq42js3wvl"; sha256 = "1d3c1a1128szlgaf3ilw5y20plz5azwp37v0ljawgm80y64hq15r";
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)"