b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

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

Browse source 
olive-editor: use qt514's overridden glibc++
This commit is contained in:
Alexander Bantyev 2022-08-09 11:11:10 +04:00 committed by GitHub
parent 50ec5970cc 07d2943f1a
commit 1fd628dbf8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkgs/applications/video/olive-editor/default.nix
View file

@ -1,8 +1,8 @@
{ lib, stdenv, fetchFromGitHub, pkg-config, which, qmake, mkDerivation,
qtmultimedia, wrapQtAppsHook, frei0r, opencolorio_1, ffmpeg-full,
CoreFoundation }:
{ lib, stdenv, fetchFromGitHub
, pkg-config, which, qmake, wrapQtAppsHook
, qtmultimedia, frei0r, opencolorio_1, ffmpeg-full, CoreFoundation }:
mkDerivation rec {
stdenv.mkDerivation rec {
pname = "olive-editor";
version = "0.1.2";

5
pkgs/top-level/all-packages.nix
View file

@ -9264,8 +9264,9 @@ with pkgs;
ola = callPackage ../applications/misc/ola { };
olive-editor = libsForQt514.callPackage ../applications/video/olive-editor
{ stdenv = gcc10StdenvCompat; inherit (darwin.apple_sdk.frameworks) CoreFoundation; };
olive-editor = libsForQt514.callPackage ../applications/video/olive-editor {
inherit (darwin.apple_sdk.frameworks) CoreFoundation;
};
ombi = callPackage ../servers/ombi { };