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

Fix wayland

Browse Source
This commit is contained in:
Eelco Dolstra 2015-06-01 21:01:53 +02:00
parent 80ebb879cd
commit b5dea5c86a
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/development/libraries/wayland/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig { lib, stdenv, fetchurl, pkgconfig
, libffi, docbook_xsl, doxygen, graphviz, libxslt, xmlto , libffi, docbook_xsl, doxygen, graphviz, libxslt, xmlto
, expat ? null # Build wayland-scanner (currently cannot be disabled as of 1.7.0) , expat ? null # Build wayland-scanner (currently cannot be disabled as of 1.7.0)
}: }:
@ -6,7 +6,6 @@
# Require the optional to be enabled until upstream fixes or removes the configure flag # Require the optional to be enabled until upstream fixes or removes the configure flag
assert expat != null; assert expat != null;
with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "wayland-${version}"; name = "wayland-${version}";
version = "1.7.0"; version = "1.7.0";
@ -16,9 +15,7 @@ stdenv.mkDerivation rec {
sha256 = "173w0pqzk2m7hjlg15bymrx7ynxgq1ciadg03hzybxwnvfi4gsmx"; sha256 = "173w0pqzk2m7hjlg15bymrx7ynxgq1ciadg03hzybxwnvfi4gsmx";
}; };
configureFlags = [ configureFlags = "--with-scanner";
(mkEnable (expat != null) "scanner" null)
];
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
@ -27,9 +24,9 @@ stdenv.mkDerivation rec {
meta = { meta = {
description = "Reference implementation of the wayland protocol"; description = "Reference implementation of the wayland protocol";
homepage = http://wayland.freedesktop.org/; homepage = http://wayland.freedesktop.org/;
license = licenses.mit; license = lib.licenses.mit;
platforms = platforms.linux; platforms = lib.platforms.linux;
maintainers = with maintainers; [ codyopel wkennington ]; maintainers = with lib.maintainers; [ codyopel wkennington ];
}; };
passthru.version = version; passthru.version = version;