git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #110706 from dotlambda/openjpeg_1-drop
commit7a59fcdf4e8b9012730bef8cdc2e0ab434a74015 authorSandro <sandro.jaeckel@gmail.com> dateMon 25 Jan 2021, 12:58 (6 years ago) parent891f607e0dd8c6
5 files changed+20−48
pkgs/development/libraries/openjpeg/1.x.nix−9 pkgs/development/libraries/openjpeg/2.x.nix−21 pkgs/development/libraries/openjpeg/generic.nix → pkgs/development/libraries/openjpeg/default.nix+16−10 pkgs/top-level/aliases.nix+2−1 pkgs/top-level/all-packages.nix+2−7
pkgs/development/libraries/openjpeg/1.x.nixdeleted−9
@@ -1,9 +0,0 @@
1−{ callPackage, ... } @ args:
2−
3−callPackage ./generic.nix (args // {
4− version = "1.5.2";
5− branch = "1.5";
6− revision = "version.1.5.2";
7− sha256 = "1dvvpvb597i5z8srz2v4c5dsbxb966h125jx3m2z0r2gd2wvpfkp";
8− testsSupport = false;
9−})
pkgs/development/libraries/openjpeg/2.x.nixdeleted−21
@@ -1,21 +0,0 @@
1−{ callPackage, fetchpatch, ... } @ args:
2−
3−callPackage ./generic.nix (args // rec {
4− version = "2.4.0";
5− branch = "2.4";
6− revision = "v${version}";
7− sha256 = "143dvy5g6v6129lzvl0r8mrgva2fppkn0zl099qmi9yi9l9h7yyf";
8−
9− extraFlags = [
10− "-DOPENJPEG_INSTALL_INCLUDE_DIR=${placeholder "dev"}/include/openjpeg-${branch}"
11− "-DOPENJPEG_INSTALL_PACKAGE_DIR=${placeholder "dev"}/lib/openjpeg-${branch}"
12− ];
13−
14− patches = [
15− ./fix-cmake-config-includedir.patch
16− (fetchpatch {
17− url = "https://patch-diff.githubusercontent.com/raw/uclouvain/openjpeg/pull/1321.patch";
18− sha256 = "1cjpr76nf9g65nqkfnxnjzi3bv7ifbxpc74kxxibh58pzjlp6al8";
19− })
20− ];
21−})
pkgs/development/libraries/openjpeg/generic.nix → pkgs/development/libraries/openjpeg/default.nixrenamed+16−10
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchFromGitHub, cmake, pkg-config
1+{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, pkg-config
22, libpng, libtiff, lcms2, jpylyzer
33, mj2Support ? true # MJ2 executables
44, jpwlLibSupport ? true # JPWL library & executables
@@ -10,8 +10,6 @@
1010, thirdPartySupport ? false # Third party libraries - OFF: only build when found, ON: always build
1111, testsSupport ? true
1212, jdk ? null
13−# Inherit generics
14−, branch, version, revision, sha256, patches ? [], extraFlags ? [], ...
1513}:
1614
1715assert jpipServerSupport -> jpipLibSupport && curl != null && fcgi != null;
@@ -23,18 +21,24 @@ let
2321 mkFlag = optSet: flag: "-D${flag}=${if optSet then "ON" else "OFF"}";
2422in
2523
26−stdenv.mkDerivation {
24+stdenv.mkDerivation rec {
2725 pname = "openjpeg";
28− inherit version;
26+ version = "2.4.0"; # don't forget to change passthru.incDir
2927
3028 src = fetchFromGitHub {
3129 owner = "uclouvain";
3230 repo = "openjpeg";
33− rev = revision;
34− inherit sha256;
31+ rev = "v${version}";
32+ sha256 = "143dvy5g6v6129lzvl0r8mrgva2fppkn0zl099qmi9yi9l9h7yyf";
3533 };
3634
37− inherit patches;
35+ patches = [
36+ ./fix-cmake-config-includedir.patch
37+ (fetchpatch {
38+ url = "https://patch-diff.githubusercontent.com/raw/uclouvain/openjpeg/pull/1321.patch";
39+ sha256 = "1cjpr76nf9g65nqkfnxnjzi3bv7ifbxpc74kxxibh58pzjlp6al8";
40+ })
41+ ];
3842
3943 outputs = [ "out" "dev" ];
4044
@@ -52,7 +56,9 @@ stdenv.mkDerivation {
5256 (mkFlag jp3dSupport "BUILD_JP3D")
5357 (mkFlag thirdPartySupport "BUILD_THIRDPARTY")
5458 (mkFlag testsSupport "BUILD_TESTING")
55− ] ++ extraFlags;
59+ "-DOPENJPEG_INSTALL_INCLUDE_DIR=${placeholder "dev"}/include/${passthru.incDir}"
60+ "-DOPENJPEG_INSTALL_PACKAGE_DIR=${placeholder "dev"}/lib/${passthru.incDir}"
61+ ];
5662
5763 nativeBuildInputs = [ cmake pkg-config ];
5864
@@ -71,7 +77,7 @@ stdenv.mkDerivation {
7177 '';
7278
7379 passthru = {
74− incDir = "openjpeg-${branch}";
80+ incDir = "openjpeg-2.4";
7581 };
7682
7783 meta = with lib; {
pkgs/top-level/aliases.nix+2−1
@@ -401,7 +401,8 @@ mapAliases ({
401401 oblogout = throw "oblogout has been removed from nixpkgs, as it's archived upstream."; # added 2019-12-10
402402 opencl-icd = ocl-icd; # added 2017-01-20
403403 openexr_ctl = ctl; # added 2018-04-25
404− openjpeg_2_1 = openjpeg_2; # added 2018-10-25
404+ openjpeg_1 = throw "openjpeg_1 has been removed, use openjpeg_2 instead"; # added 2021-01-24
405+ openjpeg_2 = openjpeg; # added 2021-01-25
405406 opensans-ttf = open-sans; # added 2018-12-04
406407 openssh_with_kerberos = openssh; # added 2018-01-28
407408 onnxruntime = throw "onnxruntime has been removed due to poor maintainability"; # added 2020-12-04
pkgs/top-level/all-packages.nix+2−7
@@ -15944,9 +15944,7 @@ in
1594415944
1594515945 openh264 = callPackage ../development/libraries/openh264 { };
1594615946
15947− openjpeg_1 = callPackage ../development/libraries/openjpeg/1.x.nix { };
15948− openjpeg_2 = callPackage ../development/libraries/openjpeg/2.x.nix { };
15949− openjpeg = openjpeg_2;
15947+ openjpeg = callPackage ../development/libraries/openjpeg { };
1595015948
1595115949 openpa = callPackage ../development/libraries/openpa { };
1595215950
@@ -21188,7 +21186,6 @@ in
2118821186 calibre = calibre-py3;
2118921187
2119021188 calligra = libsForQt5.callPackage ../applications/office/calligra {
21191− openjpeg = openjpeg_1;
2119221189 # Must use the same Qt version as Calligra itself:
2119321190 poppler = libsForQt5.poppler_0_61;
2119421191 };
@@ -22984,9 +22981,7 @@ in
2298422981
2298522982 kpt = callPackage ../applications/networking/cluster/kpt { };
2298622983
22987− krita = libsForQt5.callPackage ../applications/graphics/krita {
22988− openjpeg = openjpeg_1;
22989− };
22984+ krita = libsForQt5.callPackage ../applications/graphics/krita { };
2299022985
2299122986 krusader = libsForQt5.callPackage ../applications/misc/krusader { };
2299222987