Switch to pure FHS env

+20 -53
+11 -7
pkgs/applications/misc/houdini/default.nix
··· 1 1 { callPackage, buildFHSUserEnv, undaemonize, unwrapped ? callPackage ./runtime.nix {} }: 2 2 3 - let 4 - houdini-runtime = callPackage ./runtime.nix { }; 5 - in buildFHSUserEnv { 6 - name = "houdini-${houdini-runtime.version}"; 3 + buildFHSUserEnv { 4 + name = "houdini-${unwrapped.version}"; 5 + 6 + targetPkgs = pkgs: with pkgs; [ 7 + libGLU libGL alsa-lib fontconfig zlib libpng dbus nss nspr expat pciutils libxkbcommon 8 + ] ++ (with xorg; [ 9 + libICE libSM libXmu libXi libXext libX11 libXrender libXcursor libXfixes 10 + libXrender libXcomposite libXdamage libXtst libxcb libXScrnSaver 11 + ]); 7 12 8 13 passthru = { 9 - unwrapped = houdini-runtime; 14 + inherit unwrapped; 10 15 }; 11 16 12 - runScript = "${undaemonize}/bin/undaemonize ${houdini-runtime}/bin/houdini"; 17 + runScript = "${undaemonize}/bin/undaemonize ${unwrapped}/bin/houdini"; 13 18 } 14 -
+9 -46
pkgs/applications/misc/houdini/runtime.nix
··· 1 - { lib, stdenv, requireFile, zlib, libpng, libSM, libICE, fontconfig, xorg, libGLU, libGL, alsa-lib 2 - , dbus, xkeyboardconfig, nss, nspr, expat, pciutils, libxkbcommon, bc, addOpenGLRunpath 3 - }: 1 + { lib, stdenv, requireFile, bc }: 4 2 5 3 let 6 - # NOTE: Some dependencies only show in errors when run with QT_DEBUG_PLUGINS=1 7 - ld_library_path = builtins.concatStringsSep ":" [ 8 - "${stdenv.cc.cc.lib}/lib64" 9 - (lib.makeLibraryPath [ 10 - libGLU 11 - libGL 12 - xorg.libXmu 13 - xorg.libXi 14 - xorg.libXext 15 - xorg.libX11 16 - xorg.libXrender 17 - xorg.libXcursor 18 - xorg.libXfixes 19 - xorg.libXrender 20 - xorg.libXcomposite 21 - xorg.libXdamage 22 - xorg.libXtst 23 - xorg.libxcb 24 - xorg.libXScrnSaver 25 - alsa-lib 26 - fontconfig 27 - libSM 28 - libICE 29 - zlib 30 - libpng 31 - dbus 32 - addOpenGLRunpath.driverLink 33 - nss 34 - nspr 35 - expat 36 - pciutils 37 - libxkbcommon 38 - ]) 39 - ]; 40 4 license_dir = "~/.config/houdini"; 41 5 in 42 6 stdenv.mkDerivation rec { 43 7 version = "18.0.460"; 44 8 pname = "houdini-runtime"; 45 9 src = requireFile rec { 10 + #name = "houdini-py3-${version}-linux_x86_64_gcc6.3.tar.gz"; 11 + #sha256 = "10qp8nml1ivl0syh0iwzx3zdwdpilnwakax50wydcrzdzyxza7xw"; # 18.5.621 12 + #sha256 = "1b1k7rkn7svmciijqdwvi9p00srsf81vkb55grjg6xa7fgyidjx1"; # 18.5.596 46 13 name = "houdini-${version}-linux_x86_64_gcc6.3.tar.gz"; 47 - sha256 = "18rbwszcks2zfn9zbax62rxmq50z9mc3h39b13jpd39qjqdd3jsd"; 14 + sha256 = "18rbwszcks2zfn9zbax62rxmq50z9mc3h39b13jpd39qjqdd3jsd"; # 18.0.460 48 15 url = meta.homepage; 49 16 }; 50 17 ··· 63 30 echo -e "localValidatorDir = ${license_dir}\nlicensingMode = localValidator" > $out/houdini/Licensing.opt 64 31 sed -i "s|/usr/lib/sesi|${license_dir}|g" $out/houdini/sbin/sesinetd_safe 65 32 sed -i "s|/usr/lib/sesi|${license_dir}|g" $out/houdini/sbin/sesinetd.startup 66 - echo "export LD_LIBRARY_PATH=${ld_library_path}" >> $out/bin/app_init.sh 67 - echo "export QT_XKB_CONFIG_ROOT="${xkeyboardconfig}/share/X11/xkb"" >> $out/bin/app_init.sh 68 - echo "export LD_LIBRARY_PATH=${ld_library_path}" >> $out/houdini/sbin/app_init.sh 69 - echo "export QT_XKB_CONFIG_ROOT="${xkeyboardconfig}/share/X11/xkb"" >> $out/houdini/sbin/app_init.sh 70 33 ''; 71 - meta = { 34 + meta = with lib; { 72 35 description = "3D animation application software"; 73 36 homepage = "https://www.sidefx.com"; 74 - license = lib.licenses.unfree; 75 - platforms = lib.platforms.linux; 37 + license = licenses.unfree; 38 + platforms = platforms.linux; 76 39 hydraPlatforms = [ ]; # requireFile src's should be excluded 77 - maintainers = with lib.maintainers; [ canndrew kwohlfahrt ]; 40 + maintainers = with maintainers; [ canndrew kwohlfahrt ]; 78 41 }; 79 42 }