cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

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

Browse source
This commit is contained in:
Nguyễn Gia Phong 2022-07-17 02:26:11 +09:00
parent 4a01ca36d6
commit 07d2943f1a
No known key found for this signature in database
GPG key ID: 27148B2C06A2224B
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, { lib, stdenv, fetchFromGitHub
qtmultimedia, wrapQtAppsHook, frei0r, opencolorio_1, ffmpeg-full, , pkg-config, which, qmake, wrapQtAppsHook
CoreFoundation }: , qtmultimedia, frei0r, opencolorio_1, ffmpeg-full, CoreFoundation }:
mkDerivation rec { stdenv.mkDerivation rec {
pname = "olive-editor"; pname = "olive-editor";
version = "0.1.2"; version = "0.1.2";

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

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