lisp-modules: drop qt4 stuff
This commit is contained in:
parent
5211e5be8c
commit
1bd59b1e61
|
@ -535,88 +535,6 @@ let
|
|||
});
|
||||
|
||||
|
||||
qt = let
|
||||
rev = "dffff3ee3dbd0686c85c323f579b8bbf4881e60e";
|
||||
in build-with-compile-into-pwd rec {
|
||||
pname = "commonqt";
|
||||
version = builtins.substring 0 7 rev;
|
||||
src = pkgs.fetchFromGitHub {
|
||||
inherit rev;
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
hash = "sha256-GAgwT0D9mIkYPTHfCH/KxxIv7b6QGwcxwZE7ehH5xug=";
|
||||
};
|
||||
|
||||
buildInputs = [ pkgs.qt4 ];
|
||||
nativeBuildInputs = [ pkgs.smokegen pkgs.smokeqt ];
|
||||
nativeLibs = [ pkgs.qt4 pkgs.smokegen pkgs.smokeqt ];
|
||||
|
||||
systems = [ "qt" ];
|
||||
|
||||
lispLibs = with super; [
|
||||
cffi named-readtables cl-ppcre alexandria
|
||||
closer-mop iterate trivial-garbage bordeaux-threads
|
||||
];
|
||||
};
|
||||
|
||||
qt-libs = build-with-compile-into-pwd {
|
||||
inherit (super.qt-libs) pname version src;
|
||||
patches = [ ./patches/qt-libs-dont-download.patch ];
|
||||
prePatch = ''
|
||||
substituteInPlace systems/*.asd --replace ":qt+libs" ":qt"
|
||||
'';
|
||||
lispLibs = super.qt-libs.lispLibs ++ [ self.qt ];
|
||||
systems = [
|
||||
"qt-libs"
|
||||
"commonqt"
|
||||
# "phonon"
|
||||
# "qimageblitz"
|
||||
# "qsci"
|
||||
"qt3support"
|
||||
"qtcore"
|
||||
"qtdbus"
|
||||
"qtdeclarative"
|
||||
"qtgui"
|
||||
"qthelp"
|
||||
"qtnetwork"
|
||||
"qtopengl"
|
||||
"qtscript"
|
||||
"qtsql"
|
||||
"qtsvg"
|
||||
"qttest"
|
||||
"qtuitools"
|
||||
# "qtwebkit"
|
||||
"qtxml"
|
||||
"qtxmlpatterns"
|
||||
# "qwt"
|
||||
"smokebase"
|
||||
];
|
||||
};
|
||||
|
||||
commonqt = self.qt-libs;
|
||||
qt3support = self.qt-libs;
|
||||
qtcore = self.qt-libs;
|
||||
qtdbus = self.qt-libs;
|
||||
qtdeclarative = self.qt-libs;
|
||||
qtgui = self.qt-libs;
|
||||
qthelp = self.qt-libs;
|
||||
qtnetwork = self.qt-libs;
|
||||
qtopengl = self.qt-libs;
|
||||
qtscript = self.qt-libs;
|
||||
qtsql = self.qt-libs;
|
||||
qtsvg = self.qt-libs;
|
||||
qttest = self.qt-libs;
|
||||
qtuitools = self.qt-libs;
|
||||
qtxml = self.qt-libs;
|
||||
qtxmlpatterns = self.qt-libs;
|
||||
smokebase = self.qt-libs;
|
||||
|
||||
qtools = build-with-compile-into-pwd {
|
||||
inherit (super.qtools) pname version src nativeLibs;
|
||||
lispLibs = [ self.qt ] ++ remove super.qt_plus_libs super.qtools.lispLibs ++ [ self.qt-libs ];
|
||||
patches = [ ./patches/qtools-use-nix-libs.patch ];
|
||||
};
|
||||
|
||||
magicl = build-with-compile-into-pwd {
|
||||
inherit (super.magicl) pname version src lispLibs;
|
||||
nativeBuildInputs = [ pkgs.gfortran ];
|
||||
|
|
Loading…
Reference in a new issue