diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2013-04-04 21:43:11 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2013-04-04 21:43:40 +0200 |
| commit | eb2e46aab26600484bfabb3c242bdd069279bdb1 (patch) | |
| tree | 18ec0523bfcd0967f8eef326756f96dc0075789a /pkgs/tools/graphics | |
| parent | 16f45507619b4c4012bb7958fba09eb3bdc5ac87 (diff) | |
| parent | 22d4472d2744639ccd880f015bb3147cf5222f07 (diff) | |
| download | nixlib-eb2e46aab26600484bfabb3c242bdd069279bdb1.tar nixlib-eb2e46aab26600484bfabb3c242bdd069279bdb1.tar.gz nixlib-eb2e46aab26600484bfabb3c242bdd069279bdb1.tar.bz2 nixlib-eb2e46aab26600484bfabb3c242bdd069279bdb1.tar.lz nixlib-eb2e46aab26600484bfabb3c242bdd069279bdb1.tar.xz nixlib-eb2e46aab26600484bfabb3c242bdd069279bdb1.tar.zst nixlib-eb2e46aab26600484bfabb3c242bdd069279bdb1.zip | |
Merge branch 'master' into x-updates
Conflicts: pkgs/applications/graphics/rawtherapee/default.nix pkgs/applications/misc/blender/default.nix pkgs/applications/networking/browsers/chromium/sources.nix pkgs/os-specific/linux/kernel/linux-3.9.nix pkgs/top-level/all-packages.nix
Diffstat (limited to 'pkgs/tools/graphics')
| -rw-r--r-- | pkgs/tools/graphics/lprof/default.nix | 46 | ||||
| -rw-r--r-- | pkgs/tools/graphics/lprof/lcms-1.17.patch | 13 |
2 files changed, 59 insertions, 0 deletions
diff --git a/pkgs/tools/graphics/lprof/default.nix b/pkgs/tools/graphics/lprof/default.nix new file mode 100644 index 000000000000..31eaebc0fa1c --- /dev/null +++ b/pkgs/tools/graphics/lprof/default.nix @@ -0,0 +1,46 @@ +{ stdenv, fetchurl, scons, qt3, lcms1, libtiff, vigra }: + +/* how to calibrate your monitor: + Eg see https://wiki.archlinux.org/index.php/ICC_Profiles#Loading_ICC_Profiles +*/ +stdenv.mkDerivation { + name = "lprof-1.11.4.1"; + buildInputs = [ scons qt3 lcms1 libtiff vigra ]; + + preConfigure = '' + export QTDIR=${qt3} + export qt_directory=${qt3} + ''; + + src = fetchurl { + url = mirror://sourceforge/lprof/lprof/lprof-1.11.4/lprof-1.11.4.1.tar.gz; + sha256 = "0q8x24fm5yyvm151xrl3l03p7hvvciqnkbviprfnvlr0lyg9wsrn"; + }; + + # The sed commands disable header checks and add LDFLAGS NIX_CFLAGS_COMPILE + # to the gcc environment + buildPhase = '' + mkdir -p $out + export CXX=g++ + sed -i SConstruct \ + -e 's/def CheckForQt(context):/def CheckForQt(context):\n return 1/' \ + -e "s/not config.CheckHeader('lcms.h')/False/" \ + -e "s/not config.CheckHeader('tiff.h')/False/" \ + -e "s/not config.CheckCXXHeader('vigra\/impex.hxx')/False/" \ + \ + -e "s/^\( 'LDFLAGS'.*\)/\1\n,'NIX_CFLAGS_COMPILE' : os.environ['NIX_CFLAGS_COMPILE']/" \ + -e "s/^\( 'LDFLAGS'.*\)/\1\n,'NIX_LDFLAGS' : os.environ['NIX_LDFLAGS']/" + + scons PREFIX=$out SYSLIBS=1 install + ''; + + installPhase = ":"; + + patches = [ ./lcms-1.17.patch ]; + + meta = { + description = "Little CMS ICC profile construction set"; + homepage = "http://sourceforge.net/projects/lprof"; + license = stdenv.lib.licenses.gpl2; + }; +} diff --git a/pkgs/tools/graphics/lprof/lcms-1.17.patch b/pkgs/tools/graphics/lprof/lcms-1.17.patch new file mode 100644 index 000000000000..a88471e143fd --- /dev/null +++ b/pkgs/tools/graphics/lprof/lcms-1.17.patch @@ -0,0 +1,13 @@ +--- a/src/liblprof/lcmsprf.h 2007-08-31 15:36:20.000000000 -0700 ++++ b/src/liblprof/lcmsprf.h 2007-08-31 15:37:39.000000000 -0700 +@@ -67,6 +67,9 @@ + #define mmax(a,b) ((a) > (b)?(a):(b)) + #endif + ++#if LCMS_VERSION > 116 ++typedef int BOOL; ++#endif + + /* Misc operations ------------------------------------------------------------------------ */ + + |