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: e4c70c56af93
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: bbefb5d06a08
Choose a head ref
  • 3 commits
  • 4 files changed
  • 1 contributor

Commits on Feb 27, 2017

  1. xf86_input_multitouch: fix build

    @globin
    globin committed Feb 27, 2017
    Copy the full SHA
    8d95889 View commit details

  2. wv2: fix build

    @globin
    globin committed Feb 27, 2017

    Verified

    This commit was signed with the committer’s verified signature.
    politas Myk
    GPG key ID: 47938AAEAD85818F
    Verified
    Learn about vigilant mode
    Copy the full SHA
    e001b72 View commit details

  3. warmux: fix build

    @globin
    globin committed Feb 27, 2017
    Copy the full SHA
    bbefb5d View commit details
Showing with 10 additions and 4 deletions.
  1. +1 −1 pkgs/games/warmux/gcc-fix.patch
  2. +6 −1 pkgs/os-specific/linux/xf86-input-multitouch/default.nix
  3. +2 −0 pkgs/tools/misc/wv2/default.nix
  4. +1 −2 pkgs/top-level/all-packages.nix
2 changes: 1 addition & 1 deletion pkgs/games/warmux/gcc-fix.patch
View file
Original file line number Diff line number Diff line change
@@ -45,7 +45,7 @@ Author: Robin Gloster <mail@glob.in>
{
if (!show)
- return false;
+ return nullptr;
+ return NULL;
const std::vector<PolygonItem *>& items = poly->GetItem();
WeaponMenuItem * tmp;
Interface::GetInstance()->SetCurrentOverflyWeapon(NULL);
7 changes: 6 additions & 1 deletion pkgs/os-specific/linux/xf86-input-multitouch/default.nix
View file
Original file line number Diff line number Diff line change
@@ -7,6 +7,7 @@
, xextproto
, inputproto
, randrproto
, xorg
, libpciaccess
}:

@@ -30,7 +31,11 @@ stdenv.mkDerivation {
EndSection
'';

buildInputs = [ mtdev xproto xextproto inputproto libpciaccess randrproto ];
buildInputs = with xorg; [
mtdev xproto xextproto inputproto libpciaccess randrproto renderproto
xineramaproto resourceproto scrnsaverproto kbproto libxcb videoproto
dri3proto presentproto
];

buildPhase = ''
make INCLUDE="$NIX_CFLAGS_COMPILE -I${xorgserver.dev}/include/xorg -I${pixman}/include/pixman-1 -Iinclude"
2 changes: 2 additions & 0 deletions pkgs/tools/misc/wv2/default.nix
View file
Original file line number Diff line number Diff line change
@@ -11,6 +11,8 @@ stdenv.mkDerivation rec {

buildInputs = [ pkgconfig cmake libgsf glib libxml2 ];

NIX_CFLAGS_COMPILE = "-I${libxml2.dev}/include/libxml2";

meta = {
description = "Excellent MS Word filter lib, used in most Office suites";
license = stdenv.lib.licenses.lgpl2;
3 changes: 1 addition & 2 deletions pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -12065,8 +12065,7 @@ with pkgs;

xf86_input_mtrack = callPackage ../os-specific/linux/xf86-input-mtrack { };

xf86_input_multitouch =
callPackage ../os-specific/linux/xf86-input-multitouch { };
xf86_input_multitouch = callPackage ../os-specific/linux/xf86-input-multitouch { };

xf86_input_wacom = callPackage ../os-specific/linux/xf86-input-wacom { };