Unverified Commit 32ea6dab authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

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

parents 8c159762 da3bbd96

pkgs/applications/misc/houdini/default.nix

+5 −3
Original line number Diff line number Diff line 
{ 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 "$@"

  '';

}

pkgs/applications/misc/houdini/runtime.nix

+2 −2
Original line number Diff line number Diff line 
{ 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";

  };

}