public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #49806 from colemickens/falkon-qtwayland 

falkon: enable qtwayland
This commit is contained in:
Silvan Mosberger 2018-11-10 14:52:39 +01:00 committed by GitHub
parent 19c315c71d 4d26a57d50
commit bed0e8b089
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/applications/networking/browsers/falkon/default.nix
View File

@ -1,5 +1,9 @@
{ stdenv, fetchFromGitHub, cmake, extra-cmake-modules, pkgconfig, qmake { stdenv, lib, fetchFromGitHub, cmake, extra-cmake-modules, pkgconfig, qmake
, libpthreadstubs, libxcb, libXdmcp, qtsvg, qttools, qtwebengine, qtx11extras, kwallet }: , libpthreadstubs, libxcb, libXdmcp
, qtsvg, qttools, qtwebengine, qtx11extras
, qtwayland
, kwallet
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "falkon-${version}"; name = "falkon-${version}";
@ -21,9 +25,9 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
libpthreadstubs libxcb libXdmcp libpthreadstubs libxcb libXdmcp
qtsvg qttools qtwebengine qtx11extras
kwallet kwallet
qtsvg qtwebengine qtx11extras ] ++ lib.optionals stdenv.isLinux [ qtwayland ];
];
nativeBuildInputs = [ cmake extra-cmake-modules pkgconfig qmake qttools ]; nativeBuildInputs = [ cmake extra-cmake-modules pkgconfig qmake qttools ];