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

weston: don't depend on pixman explicitly. 

Weston depends on cairo and pixman, but cairo uses a special version of pixman.
In the previous commit I solved a linking problem by specifying the same pixman
version for weston, but it's easier to rely on cairo propagating it. Thanks
viric for the tip!
This commit is contained in:
Carles Pagès 2013-03-06 22:59:59 +01:00
parent 323d7e2ab5
commit 728116ec3e
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/window-managers/weston/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, wayland, mesa, libxkbcommon, pixman { stdenv, fetchurl, pkgconfig, wayland, mesa, libxkbcommon
, cairo, libxcb, libXcursor, x11, udev, libdrm, mtdev , cairo, libxcb, libXcursor, x11, udev, libdrm, mtdev
, libjpeg, pam, autoconf, automake, libtool }: , libjpeg, pam, autoconf, automake, libtool }:
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
sha256 = "0g2k82pnlxl8b70ykazj7kn8xffjfsmgcgx427qdrm4083z2hgm0"; sha256 = "0g2k82pnlxl8b70ykazj7kn8xffjfsmgcgx427qdrm4083z2hgm0";
}; };
buildInputs = [ pkgconfig wayland mesa libxkbcommon pixman buildInputs = [ pkgconfig wayland mesa libxkbcommon
cairo libxcb libXcursor x11 udev libdrm mtdev cairo libxcb libXcursor x11 udev libdrm mtdev
libjpeg pam autoconf automake libtool ]; libjpeg pam autoconf automake libtool ];

1
pkgs/top-level/all-packages.nix
View File

@ -8053,7 +8053,6 @@ let
cairo = cairo.override { cairo = cairo.override {
glSupport = true; glSupport = true;
}; };
pixman = pixman_cairo;
}; };
wings = callPackage ../applications/graphics/wings { }; wings = callPackage ../applications/graphics/wings { };