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: 19c315c71d2f
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: bed0e8b08952
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Nov 6, 2018

  1. falkon: enable qtwayland on linux

    @colemickens
    colemickens committed Nov 6, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    mkg20001 Maciej Krüger
    GPG key ID: 0D948CE19CF49C5F
    Verified
    Learn about vigilant mode
    Copy the full SHA
    4d26a57 View commit details

Commits on Nov 10, 2018

  1. Merge pull request #49806 from colemickens/falkon-qtwayland 

    falkon: enable qtwayland
    @infinisil
    infinisil authored Nov 10, 2018
    Copy the full SHA
    bed0e8b View commit details
Showing with 8 additions and 4 deletions.
  1. +8 −4 pkgs/applications/networking/browsers/falkon/default.nix
12 changes: 8 additions & 4 deletions pkgs/applications/networking/browsers/falkon/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
{ stdenv, fetchFromGitHub, cmake, extra-cmake-modules, pkgconfig, qmake
, libpthreadstubs, libxcb, libXdmcp, qtsvg, qttools, qtwebengine, qtx11extras, kwallet }:
{ stdenv, lib, fetchFromGitHub, cmake, extra-cmake-modules, pkgconfig, qmake
, libpthreadstubs, libxcb, libXdmcp
, qtsvg, qttools, qtwebengine, qtx11extras
, qtwayland
, kwallet
}:

stdenv.mkDerivation rec {
name = "falkon-${version}";
@@ -21,9 +25,9 @@ stdenv.mkDerivation rec {

buildInputs = [
libpthreadstubs libxcb libXdmcp
qtsvg qttools qtwebengine qtx11extras
kwallet
qtsvg qtwebengine qtx11extras
];
] ++ lib.optionals stdenv.isLinux [ qtwayland ];

nativeBuildInputs = [ cmake extra-cmake-modules pkgconfig qmake qttools ];