diff options
author | Franz Pletz <fpletz@fnordicwalking.de> | 2016-11-22 21:08:19 +0100 |
---|---|---|
committer | Franz Pletz <fpletz@fnordicwalking.de> | 2016-11-23 02:24:12 +0100 |
commit | 5a184be96f87d647f4261d83f32d08ae2f1a7403 (patch) | |
tree | 6c3739be91eb58f0671d0d71f748a036d09a86b8 /pkgs/development/libraries/imlib2 | |
parent | ffac67fcf3e3f0cc255d39f16ec4eb107703cabc (diff) | |
download | nixpkgs-5a184be96f87d647f4261d83f32d08ae2f1a7403.tar nixpkgs-5a184be96f87d647f4261d83f32d08ae2f1a7403.tar.gz nixpkgs-5a184be96f87d647f4261d83f32d08ae2f1a7403.tar.bz2 nixpkgs-5a184be96f87d647f4261d83f32d08ae2f1a7403.tar.lz nixpkgs-5a184be96f87d647f4261d83f32d08ae2f1a7403.tar.xz nixpkgs-5a184be96f87d647f4261d83f32d08ae2f1a7403.tar.zst nixpkgs-5a184be96f87d647f4261d83f32d08ae2f1a7403.zip |
imlib2: add version without X11
Diffstat (limited to 'pkgs/development/libraries/imlib2')
-rw-r--r-- | pkgs/development/libraries/imlib2/default.nix | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/pkgs/development/libraries/imlib2/default.nix b/pkgs/development/libraries/imlib2/default.nix index 85e9979ebb0..5181ff88616 100644 --- a/pkgs/development/libraries/imlib2/default.nix +++ b/pkgs/development/libraries/imlib2/default.nix @@ -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 ]; }; } |