diff options
| author | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2023-12-08 12:27:28 -0500 |
|---|---|---|
| committer | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2023-12-08 12:27:28 -0500 |
| commit | 025a27814833fa8d12a858773c88da9d6b504048 (patch) | |
| tree | e9a60eee1c16d04839564f67c2067102a48ffceb /pkgs/top-level/qt5-packages.nix | |
| parent | 14cc6db256a9d786be7bad5016da49d6b3f72f56 (diff) | |
| parent | 7a7925e7228ffc8965d7f0c6b6043941a01d6c2d (diff) | |
| download | nixlib-025a27814833fa8d12a858773c88da9d6b504048.tar nixlib-025a27814833fa8d12a858773c88da9d6b504048.tar.gz nixlib-025a27814833fa8d12a858773c88da9d6b504048.tar.bz2 nixlib-025a27814833fa8d12a858773c88da9d6b504048.tar.lz nixlib-025a27814833fa8d12a858773c88da9d6b504048.tar.xz nixlib-025a27814833fa8d12a858773c88da9d6b504048.tar.zst nixlib-025a27814833fa8d12a858773c88da9d6b504048.zip | |
Merge remote-tracking branch 'origin/master' into staging
Conflicts: pkgs/tools/networking/ofono/default.nix
Diffstat (limited to 'pkgs/top-level/qt5-packages.nix')
| -rw-r--r-- | pkgs/top-level/qt5-packages.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix index 125193c1bc63..c0da3f55b0c2 100644 --- a/pkgs/top-level/qt5-packages.nix +++ b/pkgs/top-level/qt5-packages.nix @@ -144,13 +144,13 @@ in (noExtraAttrs (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdP liblastfm = callPackage ../development/libraries/liblastfm { }; - libopenshot = callPackage ../applications/video/openshot-qt/libopenshot.nix { + libopenshot = callPackage ../development/libraries/libopenshot { stdenv = if pkgs.stdenv.isDarwin then pkgs.overrideSDK pkgs.stdenv "11.0" else pkgs.stdenv; }; packagekit-qt = callPackage ../tools/package-management/packagekit/qt.nix { }; - libopenshot-audio = callPackage ../applications/video/openshot-qt/libopenshot-audio.nix { + libopenshot-audio = callPackage ../development/libraries/libopenshot-audio { inherit (pkgs.darwin.apple_sdk.frameworks) Accelerate AGL Cocoa Foundation; }; |