obs-studio: wrap QT application to fix xcb plugin abort #65559
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
cc #65399 |
samueldr
requested changes
Jul 29, 2019
| @@ -20,7 +20,7 @@ | |||
| , pkgconfig | |||
| , vlc | |||
| , mbedtls | |||
|
|
|||
| , wrapQtAppsHook | |||
There was a problem hiding this comment.
Turns out we probably want to use mkDerivation from the qt5 set, instead of manually handling the wrapping. See the other comment about that.
(I need a comment to ask for changes :/)
There was a problem hiding this comment.
Yeah, turns out a lot of the qt applications in nixpkgs aren't packaged correctly at all...
|
This is all that's needed: diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix
index 0990062bf02..983bdff106e 100644
--- a/pkgs/applications/video/obs-studio/default.nix
+++ b/pkgs/applications/video/obs-studio/default.nix
@@ -1,4 +1,5 @@
{ config, stdenv
+, mkDerivation
, fetchFromGitHub
, cmake
, fdk_aac
@@ -34,7 +35,7 @@
let
optional = stdenv.lib.optional;
-in stdenv.mkDerivation rec {
+in mkDerivation rec {
name = "obs-studio-${version}";
version = "23.2.1";
But? What's that In the case of
|
|
Fixed up! |
grahamc
changed the title
samueldr
approved these changes
Jul 30, 2019
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation for this change
Not sure if this is the right thing to do these days, but it seemed to fix it up for me.
Things done
sandboxinnix.confon non-NixOS)nix-shell -p nix-review --run "nix-review wip"./result/bin/)nix path-info -Sbefore and after)