diff --git a/pkgs/development/libraries/openjpeg/1.x.nix b/pkgs/development/libraries/openjpeg/1.x.nix deleted file mode 100644 index beb151f0d2d..00000000000 --- a/pkgs/development/libraries/openjpeg/1.x.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ callPackage, ... } @ args: - -callPackage ./generic.nix (args // { - version = "1.5.2"; - branch = "1.5"; - revision = "version.1.5.2"; - sha256 = "1dvvpvb597i5z8srz2v4c5dsbxb966h125jx3m2z0r2gd2wvpfkp"; - testsSupport = false; -}) diff --git a/pkgs/development/libraries/openjpeg/2.x.nix b/pkgs/development/libraries/openjpeg/2.x.nix deleted file mode 100644 index edb9c9bf8c9..00000000000 --- a/pkgs/development/libraries/openjpeg/2.x.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ callPackage, fetchpatch, ... } @ args: - -callPackage ./generic.nix (args // rec { - version = "2.4.0"; - branch = "2.4"; - revision = "v${version}"; - sha256 = "143dvy5g6v6129lzvl0r8mrgva2fppkn0zl099qmi9yi9l9h7yyf"; - - extraFlags = [ - "-DOPENJPEG_INSTALL_INCLUDE_DIR=${placeholder "dev"}/include/openjpeg-${branch}" - "-DOPENJPEG_INSTALL_PACKAGE_DIR=${placeholder "dev"}/lib/openjpeg-${branch}" - ]; - - patches = [ - ./fix-cmake-config-includedir.patch - (fetchpatch { - url = "https://patch-diff.githubusercontent.com/raw/uclouvain/openjpeg/pull/1321.patch"; - sha256 = "1cjpr76nf9g65nqkfnxnjzi3bv7ifbxpc74kxxibh58pzjlp6al8"; - }) - ]; -}) diff --git a/pkgs/development/libraries/openjpeg/generic.nix b/pkgs/development/libraries/openjpeg/default.nix similarity index 77% rename from pkgs/development/libraries/openjpeg/generic.nix rename to pkgs/development/libraries/openjpeg/default.nix index 8c1f18b987d..32bfa6f2458 100644 --- a/pkgs/development/libraries/openjpeg/generic.nix +++ b/pkgs/development/libraries/openjpeg/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, pkg-config , libpng, libtiff, lcms2, jpylyzer , mj2Support ? true # MJ2 executables , jpwlLibSupport ? true # JPWL library & executables @@ -10,8 +10,6 @@ , thirdPartySupport ? false # Third party libraries - OFF: only build when found, ON: always build , testsSupport ? true , jdk ? null -# Inherit generics -, branch, version, revision, sha256, patches ? [], extraFlags ? [], ... }: assert jpipServerSupport -> jpipLibSupport && curl != null && fcgi != null; @@ -23,18 +21,24 @@ let mkFlag = optSet: flag: "-D${flag}=${if optSet then "ON" else "OFF"}"; in -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "openjpeg"; - inherit version; + version = "2.4.0"; # don't forget to change passthru.incDir src = fetchFromGitHub { owner = "uclouvain"; repo = "openjpeg"; - rev = revision; - inherit sha256; + rev = "v${version}"; + sha256 = "143dvy5g6v6129lzvl0r8mrgva2fppkn0zl099qmi9yi9l9h7yyf"; }; - inherit patches; + patches = [ + ./fix-cmake-config-includedir.patch + (fetchpatch { + url = "https://patch-diff.githubusercontent.com/raw/uclouvain/openjpeg/pull/1321.patch"; + sha256 = "1cjpr76nf9g65nqkfnxnjzi3bv7ifbxpc74kxxibh58pzjlp6al8"; + }) + ]; outputs = [ "out" "dev" ]; @@ -52,7 +56,9 @@ stdenv.mkDerivation { (mkFlag jp3dSupport "BUILD_JP3D") (mkFlag thirdPartySupport "BUILD_THIRDPARTY") (mkFlag testsSupport "BUILD_TESTING") - ] ++ extraFlags; + "-DOPENJPEG_INSTALL_INCLUDE_DIR=${placeholder "dev"}/include/${passthru.incDir}" + "-DOPENJPEG_INSTALL_PACKAGE_DIR=${placeholder "dev"}/lib/${passthru.incDir}" + ]; nativeBuildInputs = [ cmake pkg-config ]; @@ -71,7 +77,7 @@ stdenv.mkDerivation { ''; passthru = { - incDir = "openjpeg-${branch}"; + incDir = "openjpeg-2.4"; }; meta = with lib; { diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 4179ccd39f4..1b37bd3a97c 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -401,7 +401,8 @@ mapAliases ({ oblogout = throw "oblogout has been removed from nixpkgs, as it's archived upstream."; # added 2019-12-10 opencl-icd = ocl-icd; # added 2017-01-20 openexr_ctl = ctl; # added 2018-04-25 - openjpeg_2_1 = openjpeg_2; # added 2018-10-25 + openjpeg_1 = throw "openjpeg_1 has been removed, use openjpeg_2 instead"; # added 2021-01-24 + openjpeg_2 = openjpeg; # added 2021-01-25 opensans-ttf = open-sans; # added 2018-12-04 openssh_with_kerberos = openssh; # added 2018-01-28 onnxruntime = throw "onnxruntime has been removed due to poor maintainability"; # added 2020-12-04 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 73b42d95b28..e0d24da0ca8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15944,9 +15944,7 @@ in openh264 = callPackage ../development/libraries/openh264 { }; - openjpeg_1 = callPackage ../development/libraries/openjpeg/1.x.nix { }; - openjpeg_2 = callPackage ../development/libraries/openjpeg/2.x.nix { }; - openjpeg = openjpeg_2; + openjpeg = callPackage ../development/libraries/openjpeg { }; openpa = callPackage ../development/libraries/openpa { }; @@ -21188,7 +21186,6 @@ in calibre = calibre-py3; calligra = libsForQt5.callPackage ../applications/office/calligra { - openjpeg = openjpeg_1; # Must use the same Qt version as Calligra itself: poppler = libsForQt5.poppler_0_61; }; @@ -22984,9 +22981,7 @@ in kpt = callPackage ../applications/networking/cluster/kpt { }; - krita = libsForQt5.callPackage ../applications/graphics/krita { - openjpeg = openjpeg_1; - }; + krita = libsForQt5.callPackage ../applications/graphics/krita { }; krusader = libsForQt5.callPackage ../applications/misc/krusader { };