pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #252088 from dschrempf/vimiv-qt-fix-wayland

vimiv-qt: fix wayland and mainProgram

authored by Artturi and committed by GitHub 17baeb85 51a1ec6f

+6 -2
unified split
+6 -2
pkgs/applications/graphics/vimiv-qt/default.nix
··· 2 2 , fetchFromGitHub 3 3 , python3 4 4 , qt5 5 + , stdenv 5 6 , installShellFiles 6 7 }: 7 8 ··· 18 19 19 20 nativeBuildInputs = [ installShellFiles qt5.wrapQtAppsHook python3.pkgs.setuptools ]; 20 21 21 - propagatedBuildInputs = with python3.pkgs; [ pyqt5 py3exiv2 qt5.qtsvg ]; 22 + propagatedBuildInputs = with python3.pkgs; [ pyqt5 py3exiv2 ]; 23 + 24 + buildInputs = [ qt5.qtsvg ] ++ lib.optionals stdenv.isLinux [ qt5.qtwayland ]; 22 25 23 26 postInstall = '' 24 27 install -Dm644 misc/vimiv.desktop $out/share/applications/vimiv.desktop ··· 35 38 # Vimiv has to be wrapped manually because it is a non-ELF executable. 36 39 dontWrapQtApps = true; 37 40 preFixup = '' 38 - wrapQtApp $out/bin/vimiv 41 + wrapQtApp $out/bin/vimiv 39 42 ''; 40 43 41 44 meta = with lib; { ··· 43 46 license = licenses.gpl3Plus; 44 47 homepage = "https://github.com/karlch/vimiv-qt"; 45 48 maintainers = with maintainers; [ dschrempf ]; 49 + mainProgram = "vimiv"; 46 50 platforms = platforms.all; 47 51 }; 48 52 }