Merge pull request #208440 from NickCao/qt6-closure
Reduce the closure size of various qt6 packages
This commit is contained in:
commit
86f80c8f1b
|
@ -23,7 +23,7 @@ let
|
||||||
install -Dm755 OpenBoardImporter $out/bin/OpenBoardImporter
|
install -Dm755 OpenBoardImporter $out/bin/OpenBoardImporter
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
in stdenv.mkDerivation rec {
|
in stdenv.mkDerivation {
|
||||||
pname = "openboard";
|
pname = "openboard";
|
||||||
version = "unstable-2022-11-28";
|
version = "unstable-2022-11-28";
|
||||||
|
|
||||||
|
@ -36,9 +36,9 @@ in stdenv.mkDerivation rec {
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
substituteInPlace OpenBoard.pro \
|
substituteInPlace OpenBoard.pro \
|
||||||
--replace '/usr/include/quazip5' '${quazip}/include/QuaZip-Qt5-${quazip.version}/quazip' \
|
--replace '/usr/include/quazip5' '${lib.getDev quazip}/include/QuaZip-Qt5-${quazip.version}/quazip' \
|
||||||
--replace '-lquazip5' '-lquazip1-qt5' \
|
--replace '-lquazip5' '-lquazip1-qt5' \
|
||||||
--replace '/usr/include/poppler' '${poppler.dev}/include/poppler'
|
--replace '/usr/include/poppler' '${lib.getDev poppler}/include/poppler'
|
||||||
'';
|
'';
|
||||||
|
|
||||||
nativeBuildInputs = [ qmake copyDesktopItems wrapQtAppsHook ];
|
nativeBuildInputs = [ qmake copyDesktopItems wrapQtAppsHook ];
|
||||||
|
|
|
@ -61,7 +61,7 @@ stdenv.mkDerivation rec {
|
||||||
cp -a ${parts}/* parts/
|
cp -a ${parts}/* parts/
|
||||||
'';
|
'';
|
||||||
|
|
||||||
NIX_CFLAGS_COMPILE = "-I${quazip}/include/QuaZip-Qt${lib.versions.major qtbase.version}-${quazip.version}/quazip";
|
NIX_CFLAGS_COMPILE = "-I${lib.getDev quazip}/include/QuaZip-Qt${lib.versions.major qtbase.version}-${quazip.version}/quazip";
|
||||||
|
|
||||||
qmakeFlags = [
|
qmakeFlags = [
|
||||||
"phoenix.pro"
|
"phoenix.pro"
|
||||||
|
|
|
@ -32,7 +32,6 @@
|
||||||
, libsepol
|
, libsepol
|
||||||
, vulkan-headers
|
, vulkan-headers
|
||||||
, vulkan-loader
|
, vulkan-loader
|
||||||
, valgrind
|
|
||||||
, libthai
|
, libthai
|
||||||
, libdrm
|
, libdrm
|
||||||
, libdatrie
|
, libdatrie
|
||||||
|
@ -143,7 +142,6 @@ stdenv.mkDerivation rec {
|
||||||
libthai
|
libthai
|
||||||
libdrm
|
libdrm
|
||||||
libdatrie
|
libdatrie
|
||||||
valgrind
|
|
||||||
udev
|
udev
|
||||||
# Text rendering
|
# Text rendering
|
||||||
fontconfig
|
fontconfig
|
||||||
|
@ -276,6 +274,9 @@ stdenv.mkDerivation rec {
|
||||||
-e "/^bindir=/ c bindir=$dev/bin"
|
-e "/^bindir=/ c bindir=$dev/bin"
|
||||||
|
|
||||||
patchShebangs $out $dev
|
patchShebangs $out $dev
|
||||||
|
|
||||||
|
# QTEST_ASSERT and other macros keeps runtime reference to qtbase.dev
|
||||||
|
substituteInPlace "$dev/include/QtTest/qtestassert.h" --replace "__FILE__" "__BASE_FILE__"
|
||||||
'';
|
'';
|
||||||
|
|
||||||
dontStrip = debugSymbols;
|
dontStrip = debugSymbols;
|
||||||
|
|
|
@ -36,8 +36,4 @@ qtModule {
|
||||||
"bin/qmlscene"
|
"bin/qmlscene"
|
||||||
"bin/qmltestrunner"
|
"bin/qmltestrunner"
|
||||||
];
|
];
|
||||||
|
|
||||||
NIX_CFLAGS_COMPILE = [
|
|
||||||
"-fmacro-prefix-map=${qtbase.dev}=qtbase.dev"
|
|
||||||
];
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -11,5 +11,4 @@ qtModule {
|
||||||
qtInputs = [ qtbase qtdeclarative qtsvg ];
|
qtInputs = [ qtbase qtdeclarative qtsvg ];
|
||||||
propagatedBuildInputs = [ hunspell ];
|
propagatedBuildInputs = [ hunspell ];
|
||||||
nativeBuildInputs = [ pkg-config ];
|
nativeBuildInputs = [ pkg-config ];
|
||||||
outputs = [ "out" ];
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -18,6 +18,8 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
dontWrapQtApps = true;
|
dontWrapQtApps = true;
|
||||||
|
|
||||||
|
outputs = [ "out" "dev" ];
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Provides access to ZIP archives from Qt programs";
|
description = "Provides access to ZIP archives from Qt programs";
|
||||||
license = licenses.lgpl21Plus;
|
license = licenses.lgpl21Plus;
|
||||||
|
|
Loading…
Reference in a new issue