From fb1261bce44ec6ada416d5a5f3fbe0893500fd0c Mon Sep 17 00:00:00 2001 From: pedohorse <13556996+pedohorse@users.noreply.github.com> Date: Fri, 22 Sep 2023 15:03:38 +0200 Subject: [PATCH] houdini: easier runtime version substitution --- .../misc/houdini/runtime-build.nix | 35 +++++++++++++++++++ pkgs/applications/misc/houdini/runtime.nix | 34 +++--------------- 2 files changed, 39 insertions(+), 30 deletions(-) create mode 100644 pkgs/applications/misc/houdini/runtime-build.nix diff --git a/pkgs/applications/misc/houdini/runtime-build.nix b/pkgs/applications/misc/houdini/runtime-build.nix new file mode 100644 index 000000000000..60f27c194964 --- /dev/null +++ b/pkgs/applications/misc/houdini/runtime-build.nix @@ -0,0 +1,35 @@ +{ lib, stdenv, requireFile, bc, version, src, eulaDate }: + +let + license_dir = "~/.config/houdini"; +in +stdenv.mkDerivation rec { + inherit version src; + pname = "houdini-runtime"; + + buildInputs = [ bc ]; + installPhase = '' + patchShebangs houdini.install + mkdir -p $out + ./houdini.install --install-houdini \ + --install-license \ + --no-install-menus \ + --no-install-bin-symlink \ + --auto-install \ + --no-root-check \ + --accept-EULA ${eulaDate} \ + $out + echo "licensingMode = localValidator" >> $out/houdini/Licensing.opt # does not seem to do anything any more. not sure, official docs do not say anything about it + ''; + + dontFixup = true; + + meta = with lib; { + description = "3D animation application software"; + homepage = "https://www.sidefx.com"; + license = licenses.unfree; + platforms = platforms.linux; + hydraPlatforms = [ ]; # requireFile src's should be excluded + maintainers = with maintainers; [ canndrew kwohlfahrt ]; + }; +} diff --git a/pkgs/applications/misc/houdini/runtime.nix b/pkgs/applications/misc/houdini/runtime.nix index 2f218781abb6..e437dd51c885 100644 --- a/pkgs/applications/misc/houdini/runtime.nix +++ b/pkgs/applications/misc/houdini/runtime.nix @@ -1,40 +1,14 @@ -{ lib, stdenv, requireFile, bc }: +{ lib, stdenv, requireFile, callPackage}: let license_dir = "~/.config/houdini"; in -stdenv.mkDerivation rec { +callPackage ./runtime-build.nix rec { version = "19.5.569"; - pname = "houdini-runtime"; + eulaDate = "2021-10-13"; src = requireFile rec { name = "houdini-${version}-linux_x86_64_gcc9.3.tar.gz"; sha256 = "0c2d6a31c24f5e7229498af6c3a7cdf81242501d7a0792e4c33b53a898d4999e"; - url = meta.homepage; - }; - - buildInputs = [ bc ]; - installPhase = '' - patchShebangs houdini.install - mkdir -p $out - ./houdini.install --install-houdini \ - --install-license \ - --no-install-menus \ - --no-install-bin-symlink \ - --auto-install \ - --no-root-check \ - --accept-EULA 2021-10-13 \ - $out - echo "licensingMode = localValidator" >> $out/houdini/Licensing.opt # does not seem to do anything any more. not sure, official docs do not say anything about it - ''; - - dontFixup = true; - - meta = with lib; { - description = "3D animation application software"; - homepage = "https://www.sidefx.com"; - license = licenses.unfree; - platforms = platforms.linux; - hydraPlatforms = [ ]; # requireFile src's should be excluded - maintainers = with maintainers; [ canndrew kwohlfahrt ]; + url = "https://www.sidefx.com/download/daily-builds/?production=true"; }; }