diff options
author | Anderson Torres <torres.anderson.85@protonmail.com> | 2023-01-05 14:12:08 -0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-01-05 14:12:08 -0300 |
commit | 9be23ea41a1f30d0ba36d91c9279df9f003e1e23 (patch) | |
tree | 1b74a8e1b28edce8d5abf923bbeb89a373c7f209 /pkgs/development | |
parent | 977a0f86642a1c8e0403019cefc3b2fd811ba2b4 (diff) | |
parent | 113b3cb395d711ba746b15afe0907842dd7e5dd9 (diff) |
Merge pull request #208995 from wegank/imlib-drop
imlib: drop
Diffstat (limited to 'pkgs/development')
-rw-r--r-- | pkgs/development/libraries/imlib/default.nix | 64 | ||||
-rw-r--r-- | pkgs/development/libraries/libtiff/default.nix | 3 |
2 files changed, 1 insertions, 66 deletions
diff --git a/pkgs/development/libraries/imlib/default.nix b/pkgs/development/libraries/imlib/default.nix deleted file mode 100644 index af6b4285708f9..0000000000000 --- a/pkgs/development/libraries/imlib/default.nix +++ /dev/null @@ -1,64 +0,0 @@ -{ lib -, stdenv -, fetchurl -, fetchpatch -, giflib -, libX11 -, libXext -, libjpeg -, libpng -, libtiff -, xorgproto -}: - -stdenv.mkDerivation rec { - pname = "imlib"; - version = "1.9.15"; - - src = fetchurl { - url = "https://ftp.acc.umu.se/pub/GNOME/sources/imlib/1.9/${pname}-${version}.tar.gz"; - hash = "sha256-o4mQb38hgK7w4czb5lEoIH3VkuyAbIQWYP2S+7bv8j0="; - }; - - patches = [ - (fetchpatch { - name = "CVE-2007-3568.patch"; - url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-libs/imlib/files/imlib-1.9.15-bpp16-CVE-2007-3568.patch"; - sha256 = "0lxfibi094gki39sq1w4p0hcx25xlk0875agbhjkjngzx862wvbg"; - }) - - # The following two patches fix the build with recent giflib. - (fetchpatch { - url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-libs/imlib/files/imlib-1.9.15-giflib51-1.patch?id=c6d0ed89ad5653421f21cbf3b3d40fd9a1361828"; - sha256 = "0jynlhxcyjiwnz1m8j48xwz4z5csgyg03jfjc8xgpvvcyid4m65l"; - }) - (fetchpatch { - url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-libs/imlib/files/imlib-1.9.15-giflib51-2.patch?id=c6d0ed89ad5653421f21cbf3b3d40fd9a1361828"; - sha256 = "164x7rd992930rqllmr89p5ahfmbz37ipi8x0igd8gkvc8a4fd5x"; - }) - ]; - - configureFlags = [ - "--disable-shm" - "--x-includes=${libX11.dev}/include" - "--x-libraries=${libX11.out}/lib" - ]; - - buildInputs = [ - libjpeg - libXext - libX11 - xorgproto - libtiff - giflib - libpng - ]; - - meta = with lib; { - description = "An image loading and rendering library for X11"; - platforms = platforms.unix; - license = with licenses; [ gpl2Only lgpl2Only ]; - # never built on aarch64-darwin since first introduction in nixpkgs - broken = stdenv.isDarwin && stdenv.isAarch64; - }; -} diff --git a/pkgs/development/libraries/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix index ffed49235286c..20c59ed9e0d3c 100644 --- a/pkgs/development/libraries/libtiff/default.nix +++ b/pkgs/development/libraries/libtiff/default.nix @@ -18,7 +18,6 @@ , gdal , openimageio , freeimage -, imlib }: stdenv.mkDerivation rec { @@ -89,7 +88,7 @@ stdenv.mkDerivation rec { doCheck = true; passthru.tests = { - inherit libgeotiff imagemagick graphicsmagick gdal openimageio freeimage imlib; + inherit libgeotiff imagemagick graphicsmagick gdal openimageio freeimage; inherit (python3Packages) pillow imread; }; |