-
-
Notifications
You must be signed in to change notification settings - Fork 12.7k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
lightworks: init at 14.0.0 #25552
lightworks: init at 14.0.0 #25552
Conversation
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec { | |||
buildInputs = [ pkgconfig ] | |||
++ stdenv.lib.optional (!stdenv.isDarwin) alsaLib; | |||
|
|||
configureFlags = [ "--disable-mac-universal" ]; | |||
configureFlags = [ "--disable-mac-universal --enable-cxx" ]; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This change should go in a separate commit.
@@ -0,0 +1,90 @@ | |||
{ stdenv, fetchurl, dpkg, makeWrapper, patchelf, buildFHSUserEnv, | |||
gtk3, gnome3, gdk_pixbuf, cairo, libjpeg_original, glib, gnome2, mesa_glu, nvidia_cg_toolkit, zlib, openssl, portaudio }: |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please break overlong lines (>80 chars) like this:
{ stdenv ...
, gtk3 ...
}:
Note the placement of comma.
|
||
cp -r usr/lib $out | ||
|
||
# /usr/share/fonts is not normally searched |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Missing indentation.
Thanks for the review, should be fixed |
--set FONTCONFIG_FILE $out/lib/lightworks/fonts.conf | ||
|
||
wrapProgram $out/lib/lightworks/spawn \ | ||
--prefix LD_LIBRARY_PATH : ${fullPath}:$out/lib/lightworks |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this wrapper can be replaced by using the rpath
option of patchelf:
patchelf \
--interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-rpath "$out/lib/lightworks:${fullPath}" \
$out/lib/lightworks/spawn
<include>/etc/fonts/fonts.conf</include> | ||
</fontconfig>" > $out/lib/lightworks/fonts.conf | ||
|
||
${patchelf}/bin/patchelf \ |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You can just use patchelf
directly as it is in the search path of stdenv
installPhase = '' | ||
mkdir -p $out/bin | ||
cp usr/bin/lightworks $out/bin | ||
sed -i "s|/usr/lib/lightworks|$out/lib/lightworks|g" $out/bin/lightworks |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
cp usr/bin/lightworks $out/bin
sed -i "s|/usr/lib/lightworks|$out/lib/lightworks|g" $out/bin/lightworks
can be replaced by a single:
substitute usr/bin/lightworks $out/bin/lightworks \
--replace "/usr/lib/lightworks" "$out/lib/lightworks"
Thanks, I updated that. |
@GrahamcOfBorg sample 3 |
@antonxy, I'm getting |
Hm, I can reproduce the crash. It does not crash on the last commit before the merge, but crashes on the commit of the merge. But the "no version information available" message also appears on the working build so that does not seem to be the issue.
so it seems there has been some change in portaudio causing this. Indeed if I override portaudio with the version from the working commit lightworks starts again. The reason seems to be that The best solution I can think of would be to create a new package of portaudio for the old version and use that until a newer version of lightworks is released which will hopefully use the new version of portaudio. I will prepare a pull request for that. |
Motivation for this change
add Lightworks (Commercial Video Editor)
Things done
(nix.useSandbox on NixOS,
or option
build-use-sandbox
innix.conf
on non-NixOS)
nix-shell -p nox --run "nox-review wip"
./result/bin/
)This is my first PR so please let me know if anything does not fit.
Especially: Is it ok to add --enable-cxx in portaudio? According to nox-review 40 packages are affected