diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2020-02-05 19:18:11 +0100 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-02-05 19:18:35 +0100 |
commit | 0be87c79797a5fa384fbc356c74ed54f9f7829ea (patch) | |
tree | 69e2f87d4a1ec8f8962d35e330188afcf8f88dcb /pkgs/development/libraries/imlib2 | |
parent | ac241fb7a570d6cf81d229ad22a8889602639160 (diff) |
Revert "Merge master into staging-next"
I merged master into staging-next but accidentally pushed it to master. This should get us back to 87a19e9048773d5a363679617406ad148d36c3b8. This reverts commit ac241fb7a570d6cf81d229ad22a8889602639160, reversing changes made to 76a439239eb310d9ad76d998b34d5d3bc0e37acb.
Diffstat (limited to 'pkgs/development/libraries/imlib2')
-rw-r--r-- | pkgs/development/libraries/imlib2/default.nix | 37 |
1 files changed, 14 insertions, 23 deletions
diff --git a/pkgs/development/libraries/imlib2/default.nix b/pkgs/development/libraries/imlib2/default.nix index 36b1063531e43..2576580908a31 100644 --- a/pkgs/development/libraries/imlib2/default.nix +++ b/pkgs/development/libraries/imlib2/default.nix @@ -1,28 +1,19 @@ -{ stdenv, fetchurl -# Image file formats -, libjpeg, libtiff, giflib, libpng, libwebp -# imlib2 can load images from ID3 tags. -, libid3tag -, freetype , bzip2, pkgconfig -, x11Support ? true, xlibsWrapper ? null -}: - -let - inherit (stdenv.lib) optional; -in +{ stdenv, fetchurl, libjpeg, libtiff, giflib, libpng, bzip2, pkgconfig +, freetype, libid3tag +, x11Support ? true, xlibsWrapper ? null }: + +with stdenv.lib; + stdenv.mkDerivation rec { - pname = "imlib2"; - version = "1.6.1"; + name = "imlib2-1.5.1"; src = fetchurl { - url = "mirror://sourceforge/enlightenment/${pname}-${version}.tar.bz2"; - sha256 = "0v8n3dswx7rxqfd0q03xwc7j2w1mv8lv18rdxv487a1xw5vklfad"; + url = "mirror://sourceforge/enlightenment/${name}.tar.bz2"; + sha256 = "1bms2iwmvnvpz5jqq3r52glarqkafif47zbh1ykz8hw85d2mfkps"; }; - buildInputs = [ - libjpeg libtiff giflib libpng libwebp - bzip2 freetype libid3tag - ] ++ optional x11Support xlibsWrapper; + buildInputs = [ libjpeg libtiff giflib libpng bzip2 freetype libid3tag ] + ++ optional x11Support xlibsWrapper; nativeBuildInputs = [ pkgconfig ]; @@ -44,7 +35,7 @@ stdenv.mkDerivation rec { moveToOutput bin/imlib2-config "$dev" ''; - meta = with stdenv.lib; { + meta = { description = "Image manipulation library"; longDescription = '' @@ -55,8 +46,8 @@ stdenv.mkDerivation rec { easily, without sacrificing speed. ''; - homepage = "https://docs.enlightenment.org/api/imlib2/html"; - license = licenses.mit; + homepage = http://docs.enlightenment.org/api/imlib2/html; + license = licenses.free; platforms = platforms.unix; maintainers = with maintainers; [ spwhitt ]; }; |