public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #22991 from layus/deprecate-kde4-ktikz

Browse Source 
qtikz: update to Qt5; remove ktikz
This commit is contained in:
Thomas Tuegel 2017-02-20 08:37:47 -06:00 committed by GitHub
commit 7fa06b3cd2
2 changed files with 55 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
pkgs/applications/graphics/ktikz/default.nix
View File

@ -1,31 +1,42 @@
{ withKDE ? true { stdenv, fetchFromGitHub, gettext, poppler_qt5, qt5 , pkgconfig }:
, stdenv, fetchurl, gettext, poppler_qt4, qt4
# Qt only (no KDE):
, pkgconfig
# With KDE
, cmake, automoc4, kdelibs
}:
# Warning: You will also need a working pdflatex installation containing (at # Warning: You will also need a working pdflatex installation containing
# least) auctex and pgf. # at least auctex and pgf.
assert withKDE -> kdelibs != null; # This package only builds ktikz without KDE integration because KDE4 is
# deprecated and upstream does not (yet ?) support KDE5.
# See historical versions of this file for building ktikz with KDE4.
let stdenv.mkDerivation rec {
version = "0.10"; version = "unstable-20161122";
qtikz = {
name = "qtikz-${version}"; name = "qtikz-${version}";
src = fetchFromGitHub {
owner = "fhackenberger";
repo = "ktikz";
rev = "be66c8b1ff7e6b791b65af65e83c4926f307cf5a";
sha256 = "15jx53sjlnky4yg3ry1i1c29g28v1jbbvhbz66h7a49pfxa40fj3";
};
meta = with stdenv.lib; {
description = "Editor for the TikZ language";
license = licenses.gpl2;
platforms = platforms.linux;
maintainers = [ maintainers.layus ];
};
conf = '' conf = ''
# installation prefix: # installation prefix:
#PREFIX = "" PREFIX = @out@
# install desktop file here (*nix only): # install desktop file here (*nix only):
DESKTOPDIR = ''$''${PREFIX}/share/applications DESKTOP_INSTALL_DIR = @out@/share/applications
# install mimetype here: # install mimetype here:
MIMEDIR = ''$''${PREFIX}/share/mime/packages MIME_INSTALL_DIR = @out@/share/mime/packages
# install doc here:
MAN_INSTALL_DIR = @out@/share/man
CONFIG -= debug CONFIG -= debug
CONFIG += release CONFIG += release
@ -38,41 +49,22 @@ let
#QCOLLECTIONGENERATORCOMMAND = qcollectiongenerator #QCOLLECTIONGENERATORCOMMAND = qcollectiongenerator
# TikZ documentation default file path: # TikZ documentation default file path:
TIKZ_DOCUMENTATION_DEFAULT = ''$''${PREFIX}/share/doc/texmf/pgf/pgfmanual.pdf.gz TIKZ_DOCUMENTATION_DEFAULT = @out@/share/doc/texmf/pgf/pgfmanual.pdf.gz
''; '';
# 1. Configuration is done by overwriting qtikzconfig.pri
# 2. Recent Qt removed QString::fromAscii in favor of QString::fromLatin1
patchPhase = '' patchPhase = ''
echo "$conf" > conf.pri echo "$conf" | sed "s!@out@!$out!g" > qmake/qtikzconfig.pri
find -name "*.cpp" -exec sed -i s/fromAscii/fromLatin1/g "{}" \;
''; '';
configurePhase = '' configurePhase = ''
qmake PREFIX="$out" ./qtikz.pro qmake PREFIX="$out" ./qtikz.pro
''; '';
buildInputs = [ gettext qt4 poppler_qt4 pkgconfig ]; buildInputs = [ gettext qt5.full poppler_qt5 pkgconfig ];
};
ktikz = {
name = "ktikz-${version}";
buildInputs = [ kdelibs cmake qt4 automoc4 gettext poppler_qt4 ];
};
common = {
inherit version;
src = fetchurl {
url = "http://www.hackenberger.at/ktikz/ktikz_${version}.tar.gz";
sha256 = "19jl49r7dw3vb3hg52man8p2lszh71pvnx7d0xawyyi0x6r8ml9i";
};
enableParallelBuilding = true; enableParallelBuilding = true;
}
meta = with stdenv.lib; {
description = "Editor for the TikZ language";
license = licenses.gpl2;
platforms = platforms.linux;
maintainers = [ maintainers.layus ];
};
};
in stdenv.mkDerivation (common // (if withKDE then ktikz else qtikz))

7
pkgs/top-level/all-packages.nix
View File

@ -3571,10 +3571,7 @@ with pkgs;
qshowdiff = callPackage ../tools/text/qshowdiff { }; qshowdiff = callPackage ../tools/text/qshowdiff { };
qtikz = callPackage ../applications/graphics/ktikz { qtikz = callPackage ../applications/graphics/ktikz { };
withKDE = false;
kdelibs = null;
};
quicktun = callPackage ../tools/networking/quicktun { }; quicktun = callPackage ../tools/networking/quicktun { };
@ -16739,8 +16736,6 @@ with pkgs;
konversation = callPackage ../applications/networking/irc/konversation { }; konversation = callPackage ../applications/networking/irc/konversation { };
ktikz = callPackage ../applications/graphics/ktikz { };
kvirc = callPackage ../applications/networking/irc/kvirc { }; kvirc = callPackage ../applications/networking/irc/kvirc { };
krename = callPackage ../applications/misc/krename/kde4.nix { krename = callPackage ../applications/misc/krename/kde4.nix {