mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-20 04:31:52 +00:00
Code Issues Wiki Activity

imlib2: add version without X11

Browse source
This commit is contained in:
Franz Pletz 2016-11-22 21:08:19 +01:00
parent ffac67fcf3
commit 5a184be96f
No known key found for this signature in database
GPG key ID: 846FDED7792617B4
2 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
pkgs/development/libraries/imlib2/default.nix
View file

@ -1,4 +1,8 @@
{ stdenv, fetchurl, xlibsWrapper, libjpeg, libtiff, giflib, libpng, bzip2, pkgconfig }:
{ stdenv, fetchurl, libjpeg, libtiff, giflib, libpng, bzip2, pkgconfig
, freetype
, x11Support ? true, xlibsWrapper ? null }:
with stdenv.lib;
stdenv.mkDerivation rec {
name = "imlib2-1.4.9";
@ -8,7 +12,8 @@ stdenv.mkDerivation rec {
sha256 = "08809xxk2555yj6glixzw9a0x3x8cx55imd89kj3r0h152bn8a3x";
};
buildInputs = [ xlibsWrapper libjpeg libtiff giflib libpng bzip2 ];
buildInputs = [ libjpeg libtiff giflib libpng bzip2 freetype ]
++ optional x11Support xlibsWrapper;
nativeBuildInputs = [ pkgconfig ];
@ -21,7 +26,8 @@ stdenv.mkDerivation rec {
# Do not build amd64 assembly code on Darwin, because it fails to compile
# with unknow directive errors
configureFlags = if stdenv.isDarwin then [ "--enable-amd64=no" ] else null;
configureFlags = optional stdenv.isDarwin "--enable-amd64=no"
++ optional (!x11Support) "--without-x";
meta = {
description = "Image manipulation library";
@ -34,8 +40,8 @@ stdenv.mkDerivation rec {
easily, without sacrificing speed.
'';
license = stdenv.lib.licenses.free;
platforms = stdenv.lib.platforms.unix;
maintainers = with stdenv.lib.maintainers; [ spwhitt ];
license = licenses.free;
platforms = platforms.unix;
maintainers = with maintainers; [ spwhitt ];
};
}

3
pkgs/top-level/all-packages.nix
View file

@ -7452,6 +7452,9 @@ in
iml = callPackage ../development/libraries/iml { };
imlib2 = callPackage ../development/libraries/imlib2 { };
imlib2-nox = imlib2.override {
x11Support = false;
};
imlibsetroot = callPackage ../applications/graphics/imlibsetroot { libXinerama = xorg.libXinerama; } ;