Merge pull request #181752 from McSinyx/olive-editor-qt514-glibc++

olive-editor: use qt514's overridden glibc++

Changed files
+7 -6
pkgs
applications
video
olive-editor
top-level
+4 -4
pkgs/applications/video/olive-editor/default.nix
···
-
{ lib, stdenv, fetchFromGitHub, pkg-config, which, qmake, mkDerivation,
-
qtmultimedia, wrapQtAppsHook, frei0r, opencolorio_1, ffmpeg-full,
-
CoreFoundation }:
-
mkDerivation rec {
pname = "olive-editor";
version = "0.1.2";
···
+
{ lib, stdenv, fetchFromGitHub
+
, pkg-config, which, qmake, wrapQtAppsHook
+
, qtmultimedia, frei0r, opencolorio_1, ffmpeg-full, CoreFoundation }:
+
stdenv.mkDerivation rec {
pname = "olive-editor";
version = "0.1.2";
+3 -2
pkgs/top-level/all-packages.nix
···
ola = callPackage ../applications/misc/ola { };
-
olive-editor = libsForQt514.callPackage ../applications/video/olive-editor
-
{ stdenv = gcc10StdenvCompat; inherit (darwin.apple_sdk.frameworks) CoreFoundation; };
ombi = callPackage ../servers/ombi { };
···
ola = callPackage ../applications/misc/ola { };
+
olive-editor = libsForQt514.callPackage ../applications/video/olive-editor {
+
inherit (darwin.apple_sdk.frameworks) CoreFoundation;
+
};
ombi = callPackage ../servers/ombi { };