Merge pull request #112068 from doronbehar/pkg/qt-3

This commit is contained in:
Sandro
2021-02-17 14:20:49 +01:00
committed by GitHub
14 changed files with 2 additions and 425 deletions

View File

@@ -1,38 +0,0 @@
{ lib, stdenv, fetchurl, sconsPackages, 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";
nativeBuildInputs = [ sconsPackages.scons_3_0_1 ];
buildInputs = [ qt3 lcms1 libtiff vigra ];
hardeningDisable = [ "format" ];
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";
};
sconsFlags = "SYSLIBS=1";
preBuild = ''
export CXX=g++
'';
prefixKey = "PREFIX=";
patches = [ ./lcms-1.17.patch ./keep-environment.patch ];
meta = {
description = "Little CMS ICC profile construction set";
homepage = "https://sourceforge.net/projects/lprof";
license = lib.licenses.gpl2;
platforms = lib.platforms.linux;
broken = true; # Broken since 2020-07-28 (https://hydra.nixos.org/build/135234622)
};
}

View File

@@ -1,16 +0,0 @@
--- lprof-1.11.4.1.org/SConstruct 2006-06-06 02:11:32.000000000 +0100
+++ lprof-1.11.4.1/SConstruct 2017-08-29 12:56:13.425654683 +0100
@@ -22,12 +22,7 @@
# opts.Add(BoolOption('qt-mt-lib', 'Flag used to set QT library to either qt-mt or qt. Value of 1 = qt-mt, 0 = qt.', 'yes'))
# setup base environment
-env = Environment(
- ENV = {
- 'PATH' : os.environ[ 'PATH' ],
- 'HOME' : os.environ[ 'HOME' ], # required for distcc
- 'LDFLAGS' : ''
- }, options = opts)
+env = Environment(ENV = os.environ, options = opts)
opts.Update(env)
opts.Save('lprof.conf', env) # Save, so user doesn't have to

View File

@@ -1,13 +0,0 @@
--- 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 ------------------------------------------------------------------------ */