commit
9be23ea41a
|
@ -7,7 +7,6 @@
|
||||||
, fontconfig
|
, fontconfig
|
||||||
, freetype
|
, freetype
|
||||||
, fribidi
|
, fribidi
|
||||||
, imlib
|
|
||||||
, libSM
|
, libSM
|
||||||
, libX11
|
, libX11
|
||||||
, libXcursor
|
, libXcursor
|
||||||
|
@ -53,7 +52,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||||
fontconfig
|
fontconfig
|
||||||
freetype
|
freetype
|
||||||
fribidi
|
fribidi
|
||||||
imlib
|
|
||||||
libSM
|
libSM
|
||||||
libX11
|
libX11
|
||||||
libXcursor
|
libXcursor
|
||||||
|
|
|
@ -5,7 +5,6 @@
|
||||||
, gdk-pixbuf-xlib
|
, gdk-pixbuf-xlib
|
||||||
, gettext
|
, gettext
|
||||||
, gtk2
|
, gtk2
|
||||||
, imlib
|
|
||||||
, libICE
|
, libICE
|
||||||
, libSM
|
, libSM
|
||||||
, libxcrypt
|
, libxcrypt
|
||||||
|
@ -42,7 +41,6 @@ stdenv.mkDerivation rec {
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
gdk-pixbuf-xlib
|
gdk-pixbuf-xlib
|
||||||
gtk2
|
gtk2
|
||||||
imlib
|
|
||||||
libICE
|
libICE
|
||||||
libSM
|
libSM
|
||||||
libxcrypt
|
libxcrypt
|
||||||
|
|
|
@ -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;
|
|
||||||
};
|
|
||||||
}
|
|
|
@ -18,7 +18,6 @@
|
||||||
, gdal
|
, gdal
|
||||||
, openimageio
|
, openimageio
|
||||||
, freeimage
|
, freeimage
|
||||||
, imlib
|
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
|
@ -89,7 +88,7 @@ stdenv.mkDerivation rec {
|
||||||
doCheck = true;
|
doCheck = true;
|
||||||
|
|
||||||
passthru.tests = {
|
passthru.tests = {
|
||||||
inherit libgeotiff imagemagick graphicsmagick gdal openimageio freeimage imlib;
|
inherit libgeotiff imagemagick graphicsmagick gdal openimageio freeimage;
|
||||||
inherit (python3Packages) pillow imread;
|
inherit (python3Packages) pillow imread;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -649,6 +649,7 @@ mapAliases ({
|
||||||
imagemagick7Big = imagemagickBig; # Added 2021-02-22
|
imagemagick7Big = imagemagickBig; # Added 2021-02-22
|
||||||
imagemagick7 = imagemagick; # Added 2021-02-22
|
imagemagick7 = imagemagick; # Added 2021-02-22
|
||||||
imagemagick7_light = imagemagick_light; # Added 2021-02-22
|
imagemagick7_light = imagemagick_light; # Added 2021-02-22
|
||||||
|
imlib = throw "imlib has been dropped due to the lack of maintenance from upstream since 2004"; # Added 2023-01-04
|
||||||
impressive = throw "impressive has been removed due to lack of released python 2 support and maintainership in nixpkgs"; # Added 2022-01-27
|
impressive = throw "impressive has been removed due to lack of released python 2 support and maintainership in nixpkgs"; # Added 2022-01-27
|
||||||
i-score = throw "i-score has been removed: abandoned upstream"; # Added 2020-11-21
|
i-score = throw "i-score has been removed: abandoned upstream"; # Added 2020-11-21
|
||||||
inboxer = throw "inboxer has been removed as it is no longer maintained and no longer works as Google shut down the inbox service this package wrapped";
|
inboxer = throw "inboxer has been removed as it is no longer maintained and no longer works as Google shut down the inbox service this package wrapped";
|
||||||
|
|
|
@ -20044,10 +20044,6 @@ with pkgs;
|
||||||
|
|
||||||
imtui = callPackage ../development/libraries/imtui { };
|
imtui = callPackage ../development/libraries/imtui { };
|
||||||
|
|
||||||
imlib = callPackage ../development/libraries/imlib {
|
|
||||||
libpng = libpng12;
|
|
||||||
};
|
|
||||||
|
|
||||||
imv = callPackage ../applications/graphics/imv { };
|
imv = callPackage ../applications/graphics/imv { };
|
||||||
|
|
||||||
iml = callPackage ../development/libraries/iml { };
|
iml = callPackage ../development/libraries/iml { };
|
||||||
|
|
Loading…
Reference in a new issue