Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 7698197323bc
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: c3d017eee397
Choose a head ref
  • 3 commits
  • 2 files changed
  • 1 contributor

Commits on Nov 1, 2020

  1. kdenlive: avoid double wrapping

    @FRidh
    FRidh committed Nov 1, 2020
    Copy the full SHA
    016bfce View commit details

  2. kdenlive: depend on qtmultimedia instead of unsupported qtwebkit

    @FRidh
    FRidh committed Nov 1, 2020
    Copy the full SHA
    2ff2ef1 View commit details

  3. libsForQt515.mlt: is not broken

    @FRidh
    FRidh committed Nov 1, 2020
    Copy the full SHA
    c3d017e View commit details
Showing with 10 additions and 3 deletions.
  1. +10 −2 pkgs/applications/kde/kdenlive.nix
  2. +0 −1 pkgs/development/libraries/mlt/qt-5.nix
12 changes: 10 additions & 2 deletions pkgs/applications/kde/kdenlive.nix
View file
Original file line number Diff line number Diff line change
@@ -25,9 +25,9 @@
, frei0r
, phonon-backend-gstreamer
, qtdeclarative
, qtmultimedia
, qtquickcontrols2
, qtscript
, qtwebkit
, rttr
, kpurpose
, kdeclarative
@@ -60,9 +60,9 @@ mkDerivation {
mlt
phonon-backend-gstreamer
qtdeclarative
qtmultimedia
qtquickcontrols2
qtscript
qtwebkit
shared-mime-info
libv4l
ffmpeg-full
@@ -84,12 +84,20 @@ mkDerivation {
sed -i CMakeLists.txt -e '/find_package(Qt5 REQUIRED/ s|)| Concurrent)|'
substituteAllInPlace src/kdenlivesettings.kcfg
'';

dontWrapGApps = true;

# Frei0r path needs to be set too or Kdenlive will complain. See:
# https://github.com/NixOS/nixpkgs/issues/83885
# https://github.com/NixOS/nixpkgs/issues/29614#issuecomment-488849325
qtWrapperArgs = [
"--set FREI0R_PATH ${frei0r}/lib/frei0r-1"
];

preFixup = ''
qtWrapperArgs+=("''${gappsWrapperArgs[@]}")
'';

meta = {
license = with lib.licenses; [ gpl2Plus ];
};
1 change: 0 additions & 1 deletion pkgs/development/libraries/mlt/qt-5.nix
View file
Original file line number Diff line number Diff line change
@@ -69,6 +69,5 @@ stdenv.mkDerivation rec {
license = licenses.gpl3;
maintainers = [ maintainers.goibhniu ];
platforms = platforms.linux;
broken = versionAtLeast qtbase.version "5.15";
};
}