Merge pull request #138953 from Artturin/argyllupdate

argyllcms: 2.2.0 -> 2.2.1

authored by davidak and committed by GitHub 79ef3ad9 bbc0ff1e

+15 -12
+15 -12
pkgs/tools/graphics/argyllcms/default.nix
··· 4 4 5 5 stdenv.mkDerivation rec { 6 6 pname = "argyllcms"; 7 - version = "2.2.0"; 7 + version = "2.2.1"; 8 8 9 9 src = fetchzip { 10 10 # Kind of flacky URL, it was reaturning 406 and inconsistent binaries for a 11 11 # while on me. It might be good to find a mirror 12 12 url = "https://www.argyllcms.com/Argyll_V${version}_src.zip"; 13 - sha256 = "sha256-EcVwYJfJbWWXl58O3ulsrWgUYTgR4uWdMgb0Z140Pu4="; 13 + sha256 = "sha256-umY3wQfG26Okqnw+MCUnlwWTAyJ6MR/FHe5oe61KBh0="; 14 14 }; 15 15 16 - patches = [ ./gcc5.patch ]; 17 - 18 16 # The contents of this file comes from the Jamtop file from the 19 17 # root of the ArgyllCMS distribution, rewritten to pick up Nixpkgs 20 18 # library paths. When ArgyllCMS is updated, make sure that changes 21 19 # in that file is reflected here. 22 20 jamTop = writeText "argyllcms_jamtop" '' 23 21 DESTDIR = "/" ; 24 - REFSUBDIR = "ref" ; 22 + REFSUBDIR = "share/argyllcms" ; 25 23 26 24 # Keep this DESTDIR anchored to Jamtop. PREFIX is used literally 27 25 ANCHORED_PATH_VARS = DESTDIR ; ··· 41 39 # enable dummy Demo Instrument (only if code is available) 42 40 USE_DEMOINST = true ; 43 41 42 + # enable Video Test Patch Generator and 3DLUT device support 43 + # (V2.0.0 and above) 44 + USE_VTPGLUT = false ; 45 + 46 + # enable Printer device support 47 + USE_PRINTER = false ; 48 + 49 + # enable CMF Measurement device and accessory support (if present) 50 + USE_CMFM = false ; 51 + 44 52 # Use ArgyllCMS version of libusb (deprecated - don't use) 45 53 USE_LIBUSB = false ; 46 54 47 - # For testing CCast 48 - DEFINES += CCTEST_PATTERN ; 55 + # Compile in graph plotting code (Not fully implemented) 56 + USE_PLOT = true ; # [true] 49 57 50 58 JPEGLIB = ; 51 59 JPEGINC = ; ··· 97 105 98 106 # Install udev rules, but remove lines that set up the udev-acl 99 107 # stuff, since that is handled by udev's own rules (70-udev-acl.rules) 100 - # 101 - # Move ref to a better place (there must be a way to make the install target 102 - # do that for us) 103 108 postInstall = '' 104 109 rm -v $out/bin/License.txt 105 110 mkdir -p $out/etc/udev/rules.d 106 111 sed -i '/udev-acl/d' usb/55-Argyll.rules 107 112 cp -v usb/55-Argyll.rules $out/etc/udev/rules.d/ 108 - mkdir -p $out/share/ 109 - mv $out/ref $out/share/argyllcms 110 113 ''; 111 114 112 115 meta = with lib; {