From 4c7a5f76de115e1d1b4e8ddadb557e1e119b42b7 Mon Sep 17 00:00:00 2001 From: xapkohheh Date: Wed, 10 May 2023 17:26:21 +0200 Subject: [PATCH] houdini: expanded lists one entry per line for targetPkgs, executables - for simpler diffs --- pkgs/applications/misc/houdini/default.nix | 39 +++++++++++++++++++--- 1 file changed, 34 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/houdini/default.nix b/pkgs/applications/misc/houdini/default.nix index 9c560b7f8313..62e4630dc04f 100644 --- a/pkgs/applications/misc/houdini/default.nix +++ b/pkgs/applications/misc/houdini/default.nix @@ -4,11 +4,36 @@ buildFHSEnv rec { name = "houdini-${unwrapped.version}"; targetPkgs = pkgs: with pkgs; [ - libGLU libGL alsa-lib fontconfig zlib libpng dbus nss nspr expat pciutils - libxkbcommon libudev0-shim tbb + libGLU + libGL + alsa-lib + fontconfig + zlib + libpng + dbus + nss + nspr + expat + pciutils + libxkbcommon + libudev0-shim + tbb ] ++ (with xorg; [ - libICE libSM libXmu libXi libXext libX11 libXrender libXcursor libXfixes - libXrender libXcomposite libXdamage libXtst libxcb libXScrnSaver + libICE + libSM + libXmu + libXi + libXext + libX11 + libXrender + libXcursor + libXfixes + libXrender + libXcomposite + libXdamage + libXtst + libxcb + libXScrnSaver ]); passthru = { @@ -16,7 +41,11 @@ buildFHSEnv rec { }; extraInstallCommands = let - executables = [ "bin/houdini" "bin/hkey" "houdini/sbin/sesinetd" ]; + executables = [ + "bin/houdini" + "bin/hkey" + "houdini/sbin/sesinetd" + ]; in '' WRAPPER=$out/bin/${name} EXECUTABLES="${lib.concatStringsSep " " executables}"