Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: b1bff52a5ccc
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 9f4750d930d5
Choose a head ref
  • 3 commits
  • 2 files changed
  • 2 contributors

Commits on Jul 19, 2017

  1. houdini: change sha256, add missing libs, fix license dir patch, fix … 

    …keyboard input

- Changed sha256 of src file, as this was apparantly changed on the
website

- Added missing libs: some X libs, alsa, dbus

- Changed patch to $out/houdini/Licensing.opt
localValidatorDir = ... was commented out in original file
so sed had no effect

- add export QT_XKB_CONFIG_ROOT
Without it only modifier keys worked, no text input
    @antonxy
    antonxy committed Jul 19, 2017

    Verified

    This commit was signed with the committer’s verified signature.
    ijjk JJ Kasper
    GPG key ID: 47B7C67C7B64BEE6
    Verified
    Learn about vigilant mode
    Copy the full SHA
    29e88a5 View commit details

  2. houdini: 16.0.633 -> 16.0.671

    @antonxy
    antonxy committed Jul 19, 2017

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    c4ea2d0 View commit details

Commits on Jul 22, 2017

  1. Merge pull request #27480 from antonxy/houdini 

    houdini: change sha256, add missing libs, fix license dir patch, fix …
    @Mic92
    Mic92 authored Jul 22, 2017

    Verified

    This commit was signed with the committer’s verified signature.
    ijjk JJ Kasper
    GPG key ID: 47B7C67C7B64BEE6
    Verified
    Learn about vigilant mode
    Copy the full SHA
    9f4750d View commit details
Showing with 16 additions and 7 deletions.
  1. +1 −2 pkgs/applications/misc/houdini/default.nix
  2. +15 −5 pkgs/applications/misc/houdini/runtime.nix
3 changes: 1 addition & 2 deletions pkgs/applications/misc/houdini/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
{ zsh, stdenv, callPackage, buildFHSUserEnv, undaemonize }:

let
version = "16.0.633";
houdini-runtime = callPackage ./runtime.nix { };
in buildFHSUserEnv rec {
name = "houdini-${version}";
name = "houdini-${houdini-runtime.version}";

extraBuildCommands = ''
mkdir -p $out/usr/lib/sesi
20 changes: 15 additions & 5 deletions pkgs/applications/misc/houdini/runtime.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, requireFile, zlib, libpng, libSM, libICE, fontconfig, xorg, mesa_glu, bc }:
{ stdenv, requireFile, zlib, libpng, libSM, libICE, fontconfig, xorg, mesa_glu, alsaLib, dbus, xkeyboardconfig, bc }:

let
ld_library_path = builtins.concatStringsSep ":" [
@@ -11,21 +11,29 @@ let
xorg.libXext
xorg.libX11
xorg.libXrender
xorg.libXcursor
xorg.libXfixes
xorg.libXrender
xorg.libXcomposite
xorg.libXdamage
xorg.libXtst
alsaLib
fontconfig
libSM
libICE
zlib
libpng
dbus
])
];
license_dir = "~/.config/houdini";
in
stdenv.mkDerivation rec {
version = "16.0.633";
version = "16.0.671";
name = "houdini-runtime-${version}";
src = requireFile rec {
name = "houdini-16.0.633-linux_x86_64_gcc4.8.tar.gz";
sha256 = "1laxncwgsr4hj53bn4pn9ibv3pkrpliwxlx0558wgnhq42js3wvl";
name = "houdini-${version}-linux_x86_64_gcc4.8.tar.gz";
sha256 = "1d3c1a1128szlgaf3ilw5y20plz5azwp37v0ljawgm80y64hq15r";
message = ''
This nix expression requires that ${name} is already part of the store.
Download it from https://sidefx.com and add it to the nix store with:
@@ -50,11 +58,13 @@ stdenv.mkDerivation rec {
--no-root-check \
--accept-EULA \
$out
sed -i "s|/usr/lib/sesi|${license_dir}|g" $out/houdini/Licensing.opt
echo -e "localValidatorDir = ${license_dir}\nlicensingMode = localValidator" > $out/houdini/Licensing.opt
sed -i "s|/usr/lib/sesi|${license_dir}|g" $out/houdini/sbin/sesinetd_safe
sed -i "s|/usr/lib/sesi|${license_dir}|g" $out/houdini/sbin/sesinetd.startup
echo "export LD_LIBRARY_PATH=${ld_library_path}" >> $out/bin/app_init.sh
echo "export QT_XKB_CONFIG_ROOT="${xkeyboardconfig}/share/X11/xkb"" >> $out/bin/app_init.sh
echo "export LD_LIBRARY_PATH=${ld_library_path}" >> $out/houdini/sbin/app_init.sh
echo "export QT_XKB_CONFIG_ROOT="${xkeyboardconfig}/share/X11/xkb"" >> $out/houdini/sbin/app_init.sh
'';
postFixup = ''
INTERPRETER="$(cat "$NIX_CC"/nix-support/dynamic-linker)"