diff --git a/pkgs/applications/misc/houdini/default.nix b/pkgs/applications/misc/houdini/default.nix index ce35e91d9278..db06efd6a2a2 100644 --- a/pkgs/applications/misc/houdini/default.nix +++ b/pkgs/applications/misc/houdini/default.nix @@ -1,4 +1,4 @@ -{ callPackage, buildFHSUserEnv, undaemonize }: +{ callPackage, buildFHSUserEnv, undaemonize, unwrapped ? callPackage ./runtime.nix {} }: let houdini-runtime = callPackage ./runtime.nix { }; @@ -9,6 +9,10 @@ in buildFHSUserEnv { mkdir -p $out/usr/lib/sesi ''; + passthru = { + unwrapped = houdini-runtime; + }; + runScript = "${undaemonize}/bin/undaemonize ${houdini-runtime}/bin/houdini"; } diff --git a/pkgs/applications/misc/houdini/runtime.nix b/pkgs/applications/misc/houdini/runtime.nix index c9be607b3662..8436b66719f7 100644 --- a/pkgs/applications/misc/houdini/runtime.nix +++ b/pkgs/applications/misc/houdini/runtime.nix @@ -1,6 +1,9 @@ -{ lib, stdenv, requireFile, zlib, libpng, libSM, libICE, fontconfig, xorg, libGLU, libGL, alsa-lib, dbus, xkeyboardconfig, bc, addOpenGLRunpath }: +{ lib, stdenv, requireFile, zlib, libpng, libSM, libICE, fontconfig, xorg, libGLU, libGL, alsa-lib +, dbus, xkeyboardconfig, nss, nspr, expat, pciutils, libxkbcommon, bc, addOpenGLRunpath +}: let + # NOTE: Some dependencies only show in errors when run with QT_DEBUG_PLUGINS=1 ld_library_path = builtins.concatStringsSep ":" [ "${stdenv.cc.cc.lib}/lib64" (lib.makeLibraryPath [ @@ -17,6 +20,8 @@ let xorg.libXcomposite xorg.libXdamage xorg.libXtst + xorg.libxcb + xorg.libXScrnSaver alsa-lib fontconfig libSM @@ -25,26 +30,22 @@ let libpng dbus addOpenGLRunpath.driverLink + nss + nspr + expat + pciutils + libxkbcommon ]) ]; license_dir = "~/.config/houdini"; in stdenv.mkDerivation rec { - version = "17.5.327"; + version = "18.0.460"; pname = "houdini-runtime"; src = requireFile rec { name = "houdini-${version}-linux_x86_64_gcc6.3.tar.gz"; - sha256 = "1byigmhmby8lgi2vmgxy9jlrrqk7jyr507zqkihq5bv8kfsanv1x"; - message = '' - This nix expression requires that ${name} is already part of the store. - Download it from https://www.sidefx.com and add it to the nix store with: - - nix-prefetch-url - - This can't be done automatically because you need to create an account on - their website and agree to their license terms before you can download - it. That's what you get for using proprietary software. - ''; + sha256 = "18rbwszcks2zfn9zbax62rxmq50z9mc3h39b13jpd39qjqdd3jsd"; + url = meta.homepage; }; buildInputs = [ bc ]; @@ -82,7 +83,6 @@ stdenv.mkDerivation rec { license = lib.licenses.unfree; platforms = lib.platforms.linux; hydraPlatforms = [ ]; # requireFile src's should be excluded - maintainers = [ lib.maintainers.canndrew ]; + maintainers = with lib.maintainers; [ canndrew kwohlfahrt ]; }; } -