diff options
| author | Jörg Thalheim <joerg@thalheim.io> | 2017-08-29 12:57:56 +0100 |
|---|---|---|
| committer | Jörg Thalheim <joerg@thalheim.io> | 2017-08-29 12:58:37 +0100 |
| commit | d881b024d492fea78d9987a6ffeaa1e3290be668 (patch) | |
| tree | f942d98a0b66dfd35ae214aee5e08dc1ac4b2aa1 /pkgs/tools/graphics | |
| parent | 297a9ae1bdbefd2d42c07d6ca0a3816ea1f78de2 (diff) | |
| download | nixlib-d881b024d492fea78d9987a6ffeaa1e3290be668.tar nixlib-d881b024d492fea78d9987a6ffeaa1e3290be668.tar.gz nixlib-d881b024d492fea78d9987a6ffeaa1e3290be668.tar.bz2 nixlib-d881b024d492fea78d9987a6ffeaa1e3290be668.tar.lz nixlib-d881b024d492fea78d9987a6ffeaa1e3290be668.tar.xz nixlib-d881b024d492fea78d9987a6ffeaa1e3290be668.tar.zst nixlib-d881b024d492fea78d9987a6ffeaa1e3290be668.zip | |
lprof: fix build
Diffstat (limited to 'pkgs/tools/graphics')
| -rw-r--r-- | pkgs/tools/graphics/lprof/default.nix | 13 | ||||
| -rw-r--r-- | pkgs/tools/graphics/lprof/keep-environment.patch | 16 |
2 files changed, 17 insertions, 12 deletions
diff --git a/pkgs/tools/graphics/lprof/default.nix b/pkgs/tools/graphics/lprof/default.nix index 6e09dc191acc..e6773e42304b 100644 --- a/pkgs/tools/graphics/lprof/default.nix +++ b/pkgs/tools/graphics/lprof/default.nix @@ -19,27 +19,16 @@ stdenv.mkDerivation { 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,'hardeningDisable' : os.environ['hardeningDisable']/" \ - -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 ]; + patches = [ ./lcms-1.17.patch ./keep-environment.patch ]; meta = { description = "Little CMS ICC profile construction set"; diff --git a/pkgs/tools/graphics/lprof/keep-environment.patch b/pkgs/tools/graphics/lprof/keep-environment.patch new file mode 100644 index 000000000000..4dcb5b0448dd --- /dev/null +++ b/pkgs/tools/graphics/lprof/keep-environment.patch @@ -0,0 +1,16 @@ +--- 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 environemnt +-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 |