Merge pull request #112068 from doronbehar/pkg/qt-3
This commit is contained in:
Sandro
GitHub
commit
6408a8f40b
@ -1,75 +0,0 @@
|
|||||||
{stdenv, fetchurl,
|
|
||||||
zlib, libpng, libjpeg, perl, expat, qt3,
|
|
||||||
libX11, libXext, libSM, libICE,
|
|
||||||
}:
|
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
|
||||||
name = "taskjuggler-2.4.3";
|
|
||||||
src = fetchurl {
|
|
||||||
url = "http://www.taskjuggler.org/download/${name}.tar.bz2";
|
|
||||||
sha256 = "14gkxa2vwfih5z7fffbavps7m44z5bq950qndigw2icam5ks83jl";
|
|
||||||
};
|
|
||||||
|
|
||||||
buildInputs =
|
|
||||||
[zlib libpng libX11 libXext libSM libICE perl expat libjpeg]
|
|
||||||
;
|
|
||||||
|
|
||||||
patches = [ ./timezone-glibc.patch ];
|
|
||||||
|
|
||||||
preConfigure = ''
|
|
||||||
for i in $(grep -R "/bin/bash" . | sed 's/:.*//'); do
|
|
||||||
substituteInPlace $i --replace /bin/bash $(type -Pp bash)
|
|
||||||
done
|
|
||||||
for i in $(grep -R "/usr/bin/perl" . | sed 's/:.*//'); do
|
|
||||||
substituteInPlace $i --replace /usr/bin/perl ${perl}/bin/perl
|
|
||||||
done
|
|
||||||
|
|
||||||
# Fix install
|
|
||||||
for i in docs/en/Makefile.in Examples/BigProject/Common/Makefile.in Examples/BigProject/Makefile.in Examples/BigProject/Project1/Makefile.in Examples/BigProject/Project2/Makefile.in Examples/FirstProject/Makefile.in Examples/ShiftSchedule/Makefile.in; do
|
|
||||||
# Do not use variable substitution because there is some text after the last '@'
|
|
||||||
substituteInPlace $i --replace 'docprefix = @PACKAGES_DIR@' 'docprefix = $(docdir)/'
|
|
||||||
done
|
|
||||||
|
|
||||||
# Comment because the ical export need the KDE support.
|
|
||||||
for i in Examples/FirstProject/AccountingSoftware.tjp; do
|
|
||||||
substituteInPlace $i --replace "icalreport" "# icalreport"
|
|
||||||
done
|
|
||||||
|
|
||||||
for i in TestSuite/testdir TestSuite/createrefs \
|
|
||||||
TestSuite/Scheduler/Correct/Expression.sh; do
|
|
||||||
substituteInPlace $i --replace '/bin/rm' 'rm'
|
|
||||||
done
|
|
||||||
|
|
||||||
# Some tests require writing at $HOME
|
|
||||||
HOME=$TMPDIR
|
|
||||||
'';
|
|
||||||
|
|
||||||
configureFlags = [
|
|
||||||
"--without-arts" "--disable-docs"
|
|
||||||
"--x-includes=${libX11.dev}/include"
|
|
||||||
"--x-libraries=${libX11.out}/lib"
|
|
||||||
"--with-qt-dir=${qt3}"
|
|
||||||
];
|
|
||||||
|
|
||||||
preInstall = ''
|
|
||||||
mkdir -p $out/share/emacs/site-lisp/
|
|
||||||
cp Contrib/emacs/taskjug.el $out/share/emacs/site-lisp/
|
|
||||||
'';
|
|
||||||
|
|
||||||
# kde_locale is not defined when installing without kde.
|
|
||||||
installFlags = [ "kde_locale=\${out}/share/locale" ];
|
|
||||||
|
|
||||||
meta = {
|
|
||||||
homepage = "http://www.taskjuggler.org";
|
|
||||||
license = lib.licenses.gpl2;
|
|
||||||
description = "Project management tool";
|
|
||||||
longDescription = ''
|
|
||||||
TaskJuggler is a modern and powerful, Open Source project management
|
|
||||||
tool. Its new approach to project planing and tracking is more
|
|
||||||
flexible and superior to the commonly used Gantt chart editing
|
|
||||||
tools. It has already been successfully used in many projects and
|
|
||||||
scales easily to projects with hundreds of resources and thousands of
|
|
||||||
tasks.
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@ -1,48 +0,0 @@
|
|||||||
From the discussion in http://groups.google.com/group/taskjuggler-users/browse_thread/thread/f65a3efd4dcae2fc/a44c711a9d28ebee?show_docid=a44c711a9d28ebee
|
|
||||||
|
|
||||||
From: Chris Schlaeger <cs@kde.org>
|
|
||||||
Date: Sat, 27 Feb 2010 06:33:35 +0000 (+0100)
|
|
||||||
Subject: Try to fix time zone check for glibc 2.11.
|
|
||||||
X-Git-Url: http://www.taskjuggler.org/cgi-bin/gitweb.cgi?p=taskjuggler.git;a=commitdiff_plain;h=2382ed54f90c3c899badb3f56aaa2b3b5dba361e;hp=c666c5068312fec7db75e17d1c567d94127d1dda
|
|
||||||
|
|
||||||
Try to fix time zone check for glibc 2.11.
|
|
||||||
|
|
||||||
Reported-by: Lee <pFQh8RQn4fqB@dyweni.com>
|
|
||||||
---
|
|
||||||
|
|
||||||
diff --git a/taskjuggler/Utility.cpp b/taskjuggler/Utility.cpp
|
|
||||||
index 5e2bf21..9b7fce2 100644
|
|
||||||
--- a/taskjuggler/Utility.cpp
|
|
||||||
+++ b/taskjuggler/Utility.cpp
|
|
||||||
@@ -206,16 +206,28 @@ setTimezone(const char* tZone)
|
|
||||||
|
|
||||||
/* To validate the tZone value we call tzset(). It will convert the zone
|
|
||||||
* into a three-letter acronym in case the tZone value is good. If not, it
|
|
||||||
- * will just copy the wrong value to tzname[0] (glibc < 2.5) or fall back
|
|
||||||
- * to UTC. */
|
|
||||||
+ * will
|
|
||||||
+ * - copy the wrong value to tzname[0] (glibc < 2.5)
|
|
||||||
+ * - or fall back to UTC (glibc >= 2.5 && < 2.11)
|
|
||||||
+ * - copy the part before the '/' to tzname[0] (glibc >= 2.11).
|
|
||||||
+ */
|
|
||||||
tzset();
|
|
||||||
+ char* region = new(char[strlen(tZone) + 1]);
|
|
||||||
+ region[0] = 0;
|
|
||||||
+ if (strchr(tZone, '/'))
|
|
||||||
+ {
|
|
||||||
+ strcpy(region, tZone);
|
|
||||||
+ *strchr(region, '/') = 0;
|
|
||||||
+ }
|
|
||||||
if (timezone2tz(tZone) == 0 &&
|
|
||||||
- (strcmp(tzname[0], tZone) == 0 ||
|
|
||||||
+ (strcmp(tzname[0], tZone) == 0 || strcmp(tzname[0], region) == 0 ||
|
|
||||||
(strcmp(tZone, "UTC") != 0 && strcmp(tzname[0], "UTC") == 0)))
|
|
||||||
{
|
|
||||||
UtilityError = QString(i18n("Illegal timezone '%1'")).arg(tZone);
|
|
||||||
+ delete region;
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
+ delete region;
|
|
||||||
|
|
||||||
if (!LtHashTab)
|
|
||||||
return true;
|
|
||||||
@ -1,38 +0,0 @@
|
|||||||
source $stdenv/setup
|
|
||||||
|
|
||||||
|
|
||||||
preConfigure() {
|
|
||||||
|
|
||||||
# Patch some of the configure files a bit to get of global paths.
|
|
||||||
# (Buildings using stuff in those paths will fail anyway, but it
|
|
||||||
# will cause ./configure misdetections).
|
|
||||||
for i in config.tests/unix/checkavail config.tests/*/*.test mkspecs/*/qmake.conf; do
|
|
||||||
echo "patching $i..."
|
|
||||||
substituteInPlace "$i" \
|
|
||||||
--replace " /lib" " /FOO" \
|
|
||||||
--replace "/usr" "/FOO"
|
|
||||||
done
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
# !!! TODO: -system-libmng
|
|
||||||
configureFlags="-prefix $out $configureFlags"
|
|
||||||
dontAddPrefix=1
|
|
||||||
|
|
||||||
configureScript=configureScript
|
|
||||||
configureScript() {
|
|
||||||
echo yes | ./configure $configureFlags
|
|
||||||
export LD_LIBRARY_PATH=$(pwd)/lib
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
postInstall() {
|
|
||||||
# Qt's `make install' is broken; it copies ./bin/qmake, which
|
|
||||||
# is a symlink to ./qmake/qmake. So we end up with a dangling
|
|
||||||
# symlink.
|
|
||||||
rm $out/bin/qmake
|
|
||||||
cp -p qmake/qmake $out/bin
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
genericBuild
|
|
||||||
@ -1,92 +0,0 @@
|
|||||||
{ lib, stdenv, fetchurl
|
|
||||||
, xftSupport ? true, libXft ? null
|
|
||||||
, xrenderSupport ? true, libXrender ? null
|
|
||||||
, xrandrSupport ? true, libXrandr ? null
|
|
||||||
, xineramaSupport ? true, libXinerama ? null
|
|
||||||
, cursorSupport ? true, libXcursor ? null
|
|
||||||
, threadSupport ? true
|
|
||||||
, mysqlSupport ? false, libmysqlclient ? null
|
|
||||||
, libGLSupported ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms
|
|
||||||
, openglSupport ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms
|
|
||||||
, libGL ? null, libGLU ? null, libXmu ? null
|
|
||||||
, xlibsWrapper, xorgproto, zlib, libjpeg, libpng, which
|
|
||||||
}:
|
|
||||||
|
|
||||||
assert xftSupport -> libXft != null;
|
|
||||||
assert xrenderSupport -> xftSupport && libXrender != null;
|
|
||||||
assert xrandrSupport -> libXrandr != null;
|
|
||||||
assert cursorSupport -> libXcursor != null;
|
|
||||||
assert mysqlSupport -> libmysqlclient != null;
|
|
||||||
assert openglSupport -> libGL != null && libGLU != null && libXmu != null;
|
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
|
||||||
name = "qt-3.3.8";
|
|
||||||
|
|
||||||
builder = ./builder.sh;
|
|
||||||
|
|
||||||
setupHook = ./setup-hook.sh;
|
|
||||||
|
|
||||||
src = fetchurl {
|
|
||||||
url = "http://download.qt.io/archive/qt/3/qt-x11-free-3.3.8.tar.bz2";
|
|
||||||
sha256 = "0jd4g3bwkgk2s4flbmgisyihm7cam964gzb3pawjlkhas01zghz8";
|
|
||||||
};
|
|
||||||
|
|
||||||
nativeBuildInputs = [ which ];
|
|
||||||
propagatedBuildInputs = [libpng xlibsWrapper libXft libXrender zlib libjpeg];
|
|
||||||
|
|
||||||
hardeningDisable = [ "format" ];
|
|
||||||
|
|
||||||
configureFlags = let
|
|
||||||
mk = cond: name: "-${lib.optionalString (!cond) "no-"}${name}";
|
|
||||||
in [
|
|
||||||
"-v"
|
|
||||||
"-system-zlib" "-system-libpng" "-system-libjpeg"
|
|
||||||
"-qt-gif"
|
|
||||||
"-I${xorgproto}/include"
|
|
||||||
(mk threadSupport "thread")
|
|
||||||
(mk xrenderSupport "xrender")
|
|
||||||
(mk xrandrSupport "xrandr")
|
|
||||||
(mk xineramaSupport "xinerama")
|
|
||||||
(mk xrandrSupport "xrandr")
|
|
||||||
(mk xftSupport "xft")
|
|
||||||
] ++ lib.optionals openglSupport [
|
|
||||||
"-dlopen-opengl"
|
|
||||||
"-L${libGL}/lib" "-I${libGLU}/include"
|
|
||||||
"-L${libXmu.out}/lib" "-I${libXmu.dev}/include"
|
|
||||||
] ++ lib.optionals xrenderSupport [
|
|
||||||
"-L${libXrender.out}/lib" "-I${libXrender.dev}/include"
|
|
||||||
] ++ lib.optionals xrandrSupport [
|
|
||||||
"-L${libXrandr.out}/lib" "-I${libXrandr.dev}/include"
|
|
||||||
] ++ lib.optionals xineramaSupport [
|
|
||||||
"-L${libXinerama.out}/lib" "-I${libXinerama.dev}/include"
|
|
||||||
] ++ lib.optionals cursorSupport [
|
|
||||||
"-L${libXcursor.out}/lib -I${libXcursor.dev}/include"
|
|
||||||
] ++ lib.optionals mysqlSupport [
|
|
||||||
"-qt-sql-mysql" "-L${libmysqlclient}/lib/mysql" "-I${libmysqlclient}/include/mysql"
|
|
||||||
] ++ lib.optionals xftSupport [
|
|
||||||
"-L${libXft.out}/lib" "-I${libXft.dev}/include"
|
|
||||||
"-L${libXft.freetype.out}/lib" "-I${libXft.freetype.dev}/include"
|
|
||||||
"-L${libXft.fontconfig.lib}/lib" "-I${libXft.fontconfig.dev}/include"
|
|
||||||
];
|
|
||||||
|
|
||||||
patches = [
|
|
||||||
# Don't strip everything so we can get useful backtraces.
|
|
||||||
./strip.patch
|
|
||||||
|
|
||||||
# Build on NixOS.
|
|
||||||
./qt-pwd.patch
|
|
||||||
|
|
||||||
# randr.h and Xrandr.h need not be in the same prefix.
|
|
||||||
./xrandr.patch
|
|
||||||
|
|
||||||
# Make it build with gcc 4.6.0
|
|
||||||
./qt3-gcc4.6.0.patch
|
|
||||||
];
|
|
||||||
|
|
||||||
passthru = {inherit mysqlSupport;};
|
|
||||||
|
|
||||||
meta = with lib; {
|
|
||||||
license = with licenses; [ gpl2 qpl ];
|
|
||||||
platforms = platforms.linux;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@ -1,15 +0,0 @@
|
|||||||
diff -ruN qt-x11-free-3.3.3/configure qt-x11-free-3.3.3.new/configure
|
|
||||||
--- qt-x11-free-3.3.3/configure 2004-06-14 11:18:55.000000000 +0200
|
|
||||||
+++ qt-x11-free-3.3.3.new/configure 2005-11-12 19:39:43.000000000 +0100
|
|
||||||
@@ -16,9 +16,9 @@
|
|
||||||
relconf=`basename $0`
|
|
||||||
# the directory of this script is the "source tree"
|
|
||||||
relpath=`dirname $0`
|
|
||||||
-relpath=`(cd $relpath; /bin/pwd)`
|
|
||||||
+relpath=`(cd $relpath; pwd)`
|
|
||||||
# the current directory is the "build tree" or "object tree"
|
|
||||||
-outpath=`/bin/pwd`
|
|
||||||
+outpath=`pwd`
|
|
||||||
|
|
||||||
# later cache the command line in config.status
|
|
||||||
OPT_CMDLINE=`echo $@ | sed "s,-v ,,g; s,-v$,,g"`
|
|
||||||
@ -1,23 +0,0 @@
|
|||||||
I picked it here:
|
|
||||||
https://bugs.archlinux.org/task/23915
|
|
||||||
|
|
||||||
--- qt-x11-free-3.3.8b/src/tools/qmap.h~ 2008-01-15 19:09:13.000000000 +0000
|
|
||||||
+++ qt-x11-free-3.3.8b/src/tools/qmap.h 2011-04-11 00:16:04.000000000 +0100
|
|
||||||
@@ -50,6 +50,7 @@
|
|
||||||
#endif // QT_H
|
|
||||||
|
|
||||||
#ifndef QT_NO_STL
|
|
||||||
+#include <cstddef>
|
|
||||||
#include <iterator>
|
|
||||||
#include <map>
|
|
||||||
#endif
|
|
||||||
--- qt-x11-free-3.3.8b/src/tools/qvaluelist.h~ 2008-01-15 19:09:13.000000000 +0000
|
|
||||||
+++ qt-x11-free-3.3.8b/src/tools/qvaluelist.h 2011-04-11 00:16:49.000000000 +0100
|
|
||||||
@@ -48,6 +48,7 @@
|
|
||||||
#endif // QT_H
|
|
||||||
|
|
||||||
#ifndef QT_NO_STL
|
|
||||||
+#include <cstddef>
|
|
||||||
#include <iterator>
|
|
||||||
#include <list>
|
|
||||||
#endif
|
|
||||||
@ -1 +0,0 @@
|
|||||||
export QTDIR=@out@
|
|
||||||
@ -1,18 +0,0 @@
|
|||||||
diff -rc qt-x11-free-3.3.3-orig/mkspecs/linux-g++/qmake.conf qt-x11-free-3.3.3/mkspecs/linux-g++/qmake.conf
|
|
||||||
*** qt-x11-free-3.3.3-orig/mkspecs/linux-g++/qmake.conf 2004-08-05 16:42:57.000000000 +0200
|
|
||||||
--- qt-x11-free-3.3.3/mkspecs/linux-g++/qmake.conf 2005-03-02 12:25:55.000000000 +0100
|
|
||||||
***************
|
|
||||||
*** 85,90 ****
|
|
||||||
QMAKE_DEL_FILE = rm -f
|
|
||||||
QMAKE_DEL_DIR = rmdir
|
|
||||||
QMAKE_STRIP = strip
|
|
||||||
! QMAKE_STRIPFLAGS_LIB += --strip-unneeded
|
|
||||||
QMAKE_CHK_DIR_EXISTS = test -d
|
|
||||||
QMAKE_MKDIR = mkdir -p
|
|
||||||
--- 85,90 ----
|
|
||||||
QMAKE_DEL_FILE = rm -f
|
|
||||||
QMAKE_DEL_DIR = rmdir
|
|
||||||
QMAKE_STRIP = strip
|
|
||||||
! QMAKE_STRIPFLAGS_LIB += --strip-debug
|
|
||||||
QMAKE_CHK_DIR_EXISTS = test -d
|
|
||||||
QMAKE_MKDIR = mkdir -p
|
|
||||||
@ -1,42 +0,0 @@
|
|||||||
diff -rc qt-x11-free-3.3.6-orig/config.tests/x11/xrandr.test qt-x11-free-3.3.6/config.tests/x11/xrandr.test
|
|
||||||
*** qt-x11-free-3.3.6-orig/config.tests/x11/xrandr.test 2006-09-14 14:00:08.000000000 +0200
|
|
||||||
--- qt-x11-free-3.3.6/config.tests/x11/xrandr.test 2006-09-14 14:10:39.000000000 +0200
|
|
||||||
***************
|
|
||||||
*** 52,69 ****
|
|
||||||
INCDIRS="$IN_INCDIRS $XDIRS /FOO/include /include"
|
|
||||||
F=
|
|
||||||
for INCDIR in $INCDIRS; do
|
|
||||||
! if [ -f $INCDIR/$INC -a -f $INCDIR/$INC2 ]; then
|
|
||||||
F=yes
|
|
||||||
! XRANDR_H=$INCDIR/$INC
|
|
||||||
RANDR_H=$INCDIR/$INC2
|
|
||||||
! [ "$VERBOSE" = "yes" ] && echo " Found $INC in $INCDIR"
|
|
||||||
break
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
if [ -z "$F" ]
|
|
||||||
then
|
|
||||||
XRANDR=no
|
|
||||||
! [ "$VERBOSE" = "yes" ] && echo " Could not find $INC anywhere in $INCDIRS"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
--- 52,69 ----
|
|
||||||
INCDIRS="$IN_INCDIRS $XDIRS /FOO/include /include"
|
|
||||||
F=
|
|
||||||
for INCDIR in $INCDIRS; do
|
|
||||||
! if [ -f $INCDIR/$INC2 ]; then
|
|
||||||
F=yes
|
|
||||||
! # XRANDR_H=$INCDIR/$INC
|
|
||||||
RANDR_H=$INCDIR/$INC2
|
|
||||||
! [ "$VERBOSE" = "yes" ] && echo " Found $INC2 in $INCDIR"
|
|
||||||
break
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
if [ -z "$F" ]
|
|
||||||
then
|
|
||||||
XRANDR=no
|
|
||||||
! [ "$VERBOSE" = "yes" ] && echo " Could not find $INC2 anywhere in $INCDIRS"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
@ -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)
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@ -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
|
|
||||||
@ -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 ------------------------------------------------------------------------ */
|
|
||||||
|
|
||||||
|
|
||||||
@ -361,6 +361,7 @@ mapAliases ({
|
|||||||
|
|
||||||
linux-steam-integration = throw "linux-steam-integration has been removed, as the upstream project has been abandoned"; # added 2020-05-22
|
linux-steam-integration = throw "linux-steam-integration has been removed, as the upstream project has been abandoned"; # added 2020-05-22
|
||||||
loadcaffe = throw "loadcaffe has been removed, as the upstream project has been abandoned"; # added 2020-03-28
|
loadcaffe = throw "loadcaffe has been removed, as the upstream project has been abandoned"; # added 2020-03-28
|
||||||
|
lprof = throw "lprof has been removed as it's unmaintained upstream and broken in nixpkgs since a while ago"; # added 2021-02-15
|
||||||
lttngTools = lttng-tools; # added 2014-07-31
|
lttngTools = lttng-tools; # added 2014-07-31
|
||||||
lttngUst = lttng-ust; # added 2014-07-31
|
lttngUst = lttng-ust; # added 2014-07-31
|
||||||
lua5_1_sockets = lua51Packages.luasocket; # added 2017-05-02
|
lua5_1_sockets = lua51Packages.luasocket; # added 2017-05-02
|
||||||
@ -573,6 +574,7 @@ mapAliases ({
|
|||||||
retroshare06 = retroshare;
|
retroshare06 = retroshare;
|
||||||
gtk-recordmydesktop = throw "gtk-recordmydesktop has been removed from nixpkgs, as it's unmaintained and uses deprecated libraries"; # added 2019-12-10
|
gtk-recordmydesktop = throw "gtk-recordmydesktop has been removed from nixpkgs, as it's unmaintained and uses deprecated libraries"; # added 2019-12-10
|
||||||
qt-recordmydesktop = throw "qt-recordmydesktop has been removed from nixpkgs, as it's abandoned and uses deprecated libraries"; # added 2019-12-10
|
qt-recordmydesktop = throw "qt-recordmydesktop has been removed from nixpkgs, as it's abandoned and uses deprecated libraries"; # added 2019-12-10
|
||||||
|
qt-3 = throw "qt-3 has been removed from nixpkgs, as it's unmaintained and insecure"; # added 2021-02-15
|
||||||
rfkill = throw "rfkill has been removed, as it's included in util-linux"; # added 2020-08-23
|
rfkill = throw "rfkill has been removed, as it's included in util-linux"; # added 2020-08-23
|
||||||
riak-cs = throw "riak-cs is not maintained anymore"; # added 2020-10-14
|
riak-cs = throw "riak-cs is not maintained anymore"; # added 2020-10-14
|
||||||
rkt = throw "rkt was archived by upstream"; # added 2020-05-16
|
rkt = throw "rkt was archived by upstream"; # added 2020-05-16
|
||||||
|
|||||||
@ -4233,8 +4233,6 @@ in
|
|||||||
|
|
||||||
lp_solve = callPackage ../applications/science/math/lp_solve { };
|
lp_solve = callPackage ../applications/science/math/lp_solve { };
|
||||||
|
|
||||||
lprof = callPackage ../tools/graphics/lprof { };
|
|
||||||
|
|
||||||
fastlane = callPackage ../tools/admin/fastlane { };
|
fastlane = callPackage ../tools/admin/fastlane { };
|
||||||
|
|
||||||
fatresize = callPackage ../tools/filesystems/fatresize {};
|
fatresize = callPackage ../tools/filesystems/fatresize {};
|
||||||
@ -16375,10 +16373,6 @@ in
|
|||||||
|
|
||||||
qolibri = libsForQt5.callPackage ../applications/misc/qolibri { };
|
qolibri = libsForQt5.callPackage ../applications/misc/qolibri { };
|
||||||
|
|
||||||
qt3 = callPackage ../development/libraries/qt-3 {
|
|
||||||
libpng = libpng12;
|
|
||||||
};
|
|
||||||
|
|
||||||
qt4 = qt48;
|
qt4 = qt48;
|
||||||
|
|
||||||
qt48 = callPackage ../development/libraries/qt-4.x/4.8 {
|
qt48 = callPackage ../development/libraries/qt-4.x/4.8 {
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user