qscintilla: cleanup
This commit is contained in:
parent
88d7e0ff33
commit
17c0bbb496
|
@ -1,4 +1,9 @@
|
||||||
{ stdenv, lib, fetchurl, unzip, qt4, qmake4Hook
|
{ stdenv
|
||||||
|
, lib
|
||||||
|
, fetchurl
|
||||||
|
, unzip
|
||||||
|
, qt4
|
||||||
|
, qmake4Hook
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
|
@ -16,12 +21,14 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
nativeBuildInputs = [ unzip qmake4Hook ];
|
nativeBuildInputs = [ unzip qmake4Hook ];
|
||||||
|
|
||||||
patches = ./fix-qt4-build.patch;
|
patches = [
|
||||||
|
./fix-qt4-build.patch
|
||||||
|
];
|
||||||
|
|
||||||
# Make sure that libqscintilla2.so is available in $out/lib since it is expected
|
# Make sure that libqscintilla2.so is available in $out/lib since it is expected
|
||||||
# by some packages such as sqlitebrowser
|
# by some packages such as sqlitebrowser
|
||||||
postFixup = ''
|
postFixup = ''
|
||||||
ln -s $out/lib/libqscintilla2_qt?.so $out/lib/libqscintilla2.so
|
ln -s $out/lib/libqscintilla2_qt4.so $out/lib/libqscintilla2.so
|
||||||
'';
|
'';
|
||||||
|
|
||||||
dontWrapQtApps = true;
|
dontWrapQtApps = true;
|
||||||
|
|
|
@ -1,5 +1,9 @@
|
||||||
{ stdenv, lib, fetchurl, unzip
|
{ stdenv
|
||||||
, qtbase, qtmacextras
|
, lib
|
||||||
|
, fetchurl
|
||||||
|
, unzip
|
||||||
|
, qtbase
|
||||||
|
, qtmacextras
|
||||||
, qmake
|
, qmake
|
||||||
, fixDarwinDylibNames
|
, fixDarwinDylibNames
|
||||||
}:
|
}:
|
||||||
|
@ -20,12 +24,12 @@ stdenv.mkDerivation rec {
|
||||||
propagatedBuildInputs = lib.optionals stdenv.isDarwin [ qtmacextras ];
|
propagatedBuildInputs = lib.optionals stdenv.isDarwin [ qtmacextras ];
|
||||||
|
|
||||||
nativeBuildInputs = [ unzip qmake ]
|
nativeBuildInputs = [ unzip qmake ]
|
||||||
++ lib.optional stdenv.isDarwin fixDarwinDylibNames;
|
++ lib.optionals stdenv.isDarwin [ fixDarwinDylibNames ];
|
||||||
|
|
||||||
# Make sure that libqscintilla2.so is available in $out/lib since it is expected
|
# Make sure that libqscintilla2.so is available in $out/lib since it is expected
|
||||||
# by some packages such as sqlitebrowser
|
# by some packages such as sqlitebrowser
|
||||||
postFixup = ''
|
postFixup = ''
|
||||||
ln -s $out/lib/libqscintilla2_qt?.so $out/lib/libqscintilla2.so
|
ln -s $out/lib/libqscintilla2_qt5.so $out/lib/libqscintilla2.so
|
||||||
'';
|
'';
|
||||||
|
|
||||||
dontWrapQtApps = true;
|
dontWrapQtApps = true;
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
{ lib
|
{ lib
|
||||||
, buildPythonPackage
|
, buildPythonPackage
|
||||||
, disabledIf
|
|
||||||
, isPy3k
|
, isPy3k
|
||||||
, isPyPy
|
, isPyPy
|
||||||
, pkgs
|
, pkgs
|
||||||
|
@ -8,35 +7,36 @@
|
||||||
, pyqt4
|
, pyqt4
|
||||||
}:
|
}:
|
||||||
|
|
||||||
disabledIf (isPy3k || isPyPy)
|
buildPythonPackage {
|
||||||
(buildPythonPackage {
|
pname = "qscintilla-qt4";
|
||||||
pname = "qscintilla";
|
version = pkgs.qscintilla-qt4.version;
|
||||||
version = pkgs.qscintilla.version;
|
format = "other";
|
||||||
format = "other";
|
|
||||||
|
|
||||||
src = pkgs.qscintilla.src;
|
disabled = isPyPy;
|
||||||
|
|
||||||
nativeBuildInputs = [ pkgs.xorg.lndir ];
|
src = pkgs.qscintilla-qt4.src;
|
||||||
|
|
||||||
buildInputs = [ pyqt4.qt pyqt4 ];
|
nativeBuildInputs = [ pkgs.xorg.lndir ];
|
||||||
|
|
||||||
preConfigure = ''
|
buildInputs = [ pyqt4.qt pyqt4 ];
|
||||||
mkdir -p $out
|
|
||||||
lndir ${pyqt4} $out
|
|
||||||
rm -rf "$out/nix-support"
|
|
||||||
cd Python
|
|
||||||
${python.executable} ./configure-old.py \
|
|
||||||
--destdir $out/lib/${python.libPrefix}/site-packages/PyQt4 \
|
|
||||||
--apidir $out/api/${python.libPrefix} \
|
|
||||||
-n ${pkgs.qscintilla}/include \
|
|
||||||
-o ${pkgs.qscintilla}/lib \
|
|
||||||
--sipdir $out/share/sip
|
|
||||||
'';
|
|
||||||
|
|
||||||
meta = with lib; {
|
preConfigure = ''
|
||||||
description = "A Python binding to QScintilla, Qt based text editing control";
|
mkdir -p $out
|
||||||
license = licenses.lgpl21Plus;
|
lndir ${pyqt4} $out
|
||||||
maintainers = with maintainers; [ danbst ];
|
rm -rf "$out/nix-support"
|
||||||
platforms = platforms.linux;
|
cd Python
|
||||||
};
|
${python.executable} ./configure-old.py \
|
||||||
})
|
--destdir $out/lib/${python.libPrefix}/site-packages/PyQt4 \
|
||||||
|
--apidir $out/api/${python.libPrefix} \
|
||||||
|
-n ${pkgs.qscintilla-qt4}/include \
|
||||||
|
-o ${pkgs.qscintilla-qt4}/lib \
|
||||||
|
--sipdir $out/share/sip
|
||||||
|
'';
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
description = "A Python binding to QScintilla, Qt based text editing control";
|
||||||
|
license = licenses.lgpl21Plus;
|
||||||
|
maintainers = with maintainers; [ danbst ];
|
||||||
|
platforms = platforms.linux;
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
let
|
let
|
||||||
inherit (pythonPackages) buildPythonPackage isPy3k python sip sipbuild pyqt5 pyqt-builder;
|
inherit (pythonPackages) buildPythonPackage isPy3k python sip sipbuild pyqt5 pyqt-builder;
|
||||||
in buildPythonPackage rec {
|
in buildPythonPackage rec {
|
||||||
pname = "qscintilla";
|
pname = "qscintilla-qt5";
|
||||||
version = qscintilla.version;
|
version = qscintilla.version;
|
||||||
src = qscintilla.src;
|
src = qscintilla.src;
|
||||||
format = "pyproject";
|
format = "pyproject";
|
||||||
|
|
|
@ -1,43 +0,0 @@
|
||||||
{ lib
|
|
||||||
, buildPythonPackage
|
|
||||||
, disabledIf
|
|
||||||
, isPy3k
|
|
||||||
, isPyPy
|
|
||||||
, pkgs
|
|
||||||
, python
|
|
||||||
, pyqt4
|
|
||||||
}:
|
|
||||||
|
|
||||||
disabledIf (isPy3k || isPyPy)
|
|
||||||
(buildPythonPackage {
|
|
||||||
# TODO: Qt5 support
|
|
||||||
pname = "qscintilla";
|
|
||||||
version = pkgs.qscintilla.version;
|
|
||||||
format = "other";
|
|
||||||
|
|
||||||
src = pkgs.qscintilla.src;
|
|
||||||
|
|
||||||
nativeBuildInputs = [ pkgs.xorg.lndir ];
|
|
||||||
|
|
||||||
buildInputs = [ pyqt4.qt pyqt4 ];
|
|
||||||
|
|
||||||
preConfigure = ''
|
|
||||||
mkdir -p $out
|
|
||||||
lndir ${pyqt4} $out
|
|
||||||
rm -rf "$out/nix-support"
|
|
||||||
cd Python
|
|
||||||
${python.executable} ./configure-old.py \
|
|
||||||
--destdir $out/lib/${python.libPrefix}/site-packages/PyQt4 \
|
|
||||||
--apidir $out/api/${python.libPrefix} \
|
|
||||||
-n ${pkgs.qscintilla}/include \
|
|
||||||
-o ${pkgs.qscintilla}/lib \
|
|
||||||
--sipdir $out/share/sip
|
|
||||||
'';
|
|
||||||
|
|
||||||
meta = with lib; {
|
|
||||||
description = "A Python binding to QScintilla, Qt based text editing control";
|
|
||||||
license = licenses.lgpl21Plus;
|
|
||||||
maintainers = with maintainers; [ danbst ];
|
|
||||||
platforms = platforms.unix;
|
|
||||||
};
|
|
||||||
})
|
|
Loading…
Reference in a new issue