wrapQtAppsHook: Remove ad hoc Qt wrappers
This commit is contained in:
@@ -1,11 +1,11 @@
|
||||
{ stdenv, fetchsvn, makeWrapper, pkgconfig, cmake, qtbase, cairo, pixman,
|
||||
{ stdenv, fetchsvn, wrapQtAppsHook, pkgconfig, cmake, qtbase, cairo, pixman,
|
||||
boost, cups, fontconfig, freetype, hunspell, libjpeg, libtiff, libxml2, lcms2,
|
||||
podofo, poppler, poppler_data, python2, harfbuzz, qtimageformats, qttools }:
|
||||
|
||||
let
|
||||
pythonEnv = python2.withPackages(ps: [ps.tkinter ps.pillow]);
|
||||
revision = "22806";
|
||||
in
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
name = "scribus-unstable-${version}";
|
||||
version = "2019-01-16";
|
||||
@@ -18,17 +18,13 @@ stdenv.mkDerivation rec {
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
nativeBuildInputs = [ wrapQtAppsHook ];
|
||||
buildInputs = [
|
||||
makeWrapper pkgconfig cmake qtbase cairo pixman boost cups fontconfig
|
||||
pkgconfig cmake qtbase cairo pixman boost cups fontconfig
|
||||
freetype hunspell libjpeg libtiff libxml2 lcms2 podofo poppler
|
||||
poppler_data pythonEnv harfbuzz qtimageformats qttools
|
||||
];
|
||||
|
||||
postFixup = ''
|
||||
wrapProgram $out/bin/scribus \
|
||||
--prefix QT_PLUGIN_PATH : "${qtbase}/${qtbase.qtPluginPrefix}"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
maintainers = [ stdenv.lib.maintainers.erictapen ];
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
|
||||
Reference in New Issue
Block a user