argyllcms 1.4.0 -> 1.8.1

pkgs/tools/graphics/argyllcms/default.nix

@@ -1,13 +1,17 @@
-{ stdenv, fetchurl, jam, unzip, libX11, libXxf86vm, libXrandr, libXinerama
+{ stdenv, fetchzip, jam, unzip, libX11, libXxf86vm, libXrandr, libXinerama
-, libXrender, libXext, libtiff, libjpeg, libXScrnSaver, writeText
+, libXrender, libXext, libtiff, libjpeg, libpng, libXScrnSaver, writeText
-, libXdmcp, libXau, lib }:
+, libXdmcp, libXau, lib, openssl, zlib }:
-
+let
+  version = "1.8.1";
+ in
 stdenv.mkDerivation rec {
-  name = "argyllcms-1.4.0";
+  name = "argyllcms-${version}";
 
-  src = fetchurl {
+  src = fetchzip {
-    url = "http://www.argyllcms.com/Argyll_V1.4.0_src.zip";
+    # Kind of flacky URL, it was reaturning 406 and inconsistent binaries for a
-    sha256 = "1a5i0972cjp6asmawmyzih2y4bv3i0qvf7p6z5lxnr199mq38cfk";
+    # while on me. It might be good to find a mirror
+    url = "http://www.argyllcms.com/Argyll_V${version}_src.zip";
+    sha256 = "1nnhqcvx65m5rzrlry5kkjgrnl90shjgz7dbin8nz27lzni6c3xz";
   };
 
   # The contents of this file comes from the Jamtop file from the
@@ -24,14 +28,23 @@ stdenv.mkDerivation rec {
     # Tell standalone libraries that they are part of Argyll:
     DEFINES += ARGYLLCMS ;
 
-    # Use libusb1 rather than libusb0 & libusb0-win32
+    # enable serial instruments & support
-    USE_LIBUSB1 = true ;
+    USE_SERIAL = true ;
 
-    # Make the USB V1 library static
+    # enable fast serial instruments & support
-    LIBUSB_IS_DLL = false ;
+    USE_FAST_SERIAL = true ;                # (Implicit in USE_SERIAL too)
 
-    # Set the libubs1 library name.
+    # enable USB instruments & support
-    LIBUSB1NAME = libusb-1A ;
+    USE_USB = true ;
+
+    # enable dummy Demo Instrument (only if code is available)
+    USE_DEMOINST = true ;
+
+    # Use ArgyllCMS version of libusb (deprecated - don't use)
+    USE_LIBUSB = false ;
+
+    # For testing CCast
+    DEFINES += CCTEST_PATTERN ;
 
     JPEGLIB = ;
     JPEGINC = ;
@@ -41,10 +54,22 @@ stdenv.mkDerivation rec {
     TIFFINC = ;
     HAVE_TIFF = true ;
 
+    PNGLIB = ;
+    PNGINC = ;
+    HAVE_PNG = true ;
+
+    ZLIB = ;
+    ZINC = ;
+    HAVE_Z = true ;
+
+    SSLLIB = ;
+    SSLINC = ;
+    HAVE_SSL = true ;
+
     LINKFLAGS +=
       ${lib.concatStringsSep " " (map (x: "-L${x}/lib") buildInputs)}
       -ldl -lrt -lX11 -lXext -lXxf86vm -lXinerama -lXrandr -lXau -lXdmcp -lXss
-      -ljpeg -ltiff ;
+      -ljpeg -ltiff -lpng -lssl ;
   '';
 
   nativeBuildInputs = [ jam unzip ];
@@ -52,27 +77,31 @@ stdenv.mkDerivation rec {
   preConfigure = ''
     cp ${jamTop} Jamtop
     substituteInPlace Makefile --replace "-j 3" "-j $NIX_BUILD_CORES"
-    # Remove tiff and jpg to be sure the nixpkgs-provided ones are used
+    # Remove tiff, jpg and png to be sure the nixpkgs-provided ones are used
-    rm -rf tiff jpg
+    rm -rf tiff jpg png
   '';
 
   buildInputs = [
-    libtiff libjpeg libX11 libXxf86vm libXrandr libXinerama libXext
+    libtiff libjpeg libpng libX11 libXxf86vm libXrandr libXinerama libXext
-    libXrender libXScrnSaver libXdmcp libXau
+    libXrender libXScrnSaver libXdmcp libXau openssl
   ];
 
   buildFlags = "PREFIX=$(out) all";
 
   installFlags = "PREFIX=$(out)";
 
-  # Install udev rules, but remove lines that set up the udev-acl and plugdev
+  # Install udev rules, but remove lines that set up the udev-acl
   # stuff, since that is handled by udev's own rules (70-udev-acl.rules)
+  #
+  # Move ref to a better place (there must be a way to make the install target
+  # do that for us)
   postInstall = ''
     rm -v $out/bin/License.txt
     mkdir -p $out/etc/udev/rules.d
-    sed -i '/udev-acl/d' libusb1/55-Argyll.rules
+    sed -i '/udev-acl/d' usb/55-Argyll.rules
-    sed -i '/plugdev/d' libusb1/55-Argyll.rules
+    cp -v usb/55-Argyll.rules $out/etc/udev/rules.d/
-    cp -v libusb1/55-Argyll.rules $out/etc/udev/rules.d/
+    mkdir -p $out/share/
+    mv $out/ref $out/share/argyllcms
   '';
 
   meta = with stdenv.lib; {