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