nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-23 23:43:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #311324 from pedohorse/houdini_20-0-506_20-0-688

Browse Source
This commit is contained in:
Sandro 2024-06-02 23:50:04 +02:00 committed by GitHub
commit 32ea6dabab
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
{ lib, stdenv, writeScript, callPackage, buildFHSEnv, unwrapped ? callPackage ./runtime.nix {} }:
{ lib, stdenv, writeScript, ncurses5, callPackage, buildFHSEnv, unwrapped ? callPackage ./runtime.nix {} }:
buildFHSEnv rec {
name = "houdini-${unwrapped.version}";
@ -30,7 +30,6 @@ buildFHSEnv rec {
bintools # needed for ld and other tools, so ctypes can find/load sos from python
ocl-icd # needed for opencl
numactl # needed by hfs ocl backend
ncurses5 # needed by hfs ocl backend
zstd # needed from 20.0
] ++ (with xorg; [
libICE
@ -83,7 +82,7 @@ buildFHSEnv rec {
mkdir -p $out/$(dirname $executable)
echo "#!${stdenv.shell}" >> $out/$executable
echo "$WRAPPER ${unwrapped}/$executable \"\$@\"" >> $out/$executable
echo "exec $WRAPPER ${unwrapped}/$executable \"\$@\"" >> $out/$executable
done
cd $out
@ -96,6 +95,9 @@ buildFHSEnv rec {
];
runScript = writeScript "${name}-wrapper" ''
# ncurses5 is needed by hfs ocl backend
# workaround for this issue: https://github.com/NixOS/nixpkgs/issues/89769
export LD_LIBRARY_PATH=${lib.makeLibraryPath [ncurses5]}:$LD_LIBRARY_PATH
exec "$@"
'';
}

4
pkgs/applications/misc/houdini/runtime.nix
View File

@ -1,11 +1,11 @@
{ lib, stdenv, requireFile, callPackage}:
callPackage ./runtime-build.nix rec {
version = "20.0.506";
version = "20.0.688";
eulaDate = "2021-10-13";
src = requireFile rec {
name = "houdini-${version}-linux_x86_64_gcc11.2.tar.gz";
sha256 = "10dcb695bf9bb6407ccfd91c67858d69864208ee97e1e9afe216abf99db549f5";
sha256 = "99f9088824c328de9d351f037f26ff1cba960fbd9b4e2ed1d52601680d3512a6";
url = "https://www.sidefx.com/download/daily-builds/?production=true";
};
}