Merge branch 'master' into stdenv-updates

Conflict in kerberos, which was updated both in master and in
stdenv-updates. Kept the stdenv-updates version, except pulled in the
enableParallelBuilding change from master.

Signed-off-by: Shea Levy <shea@shealevy.com>

Conflicts:
	pkgs/development/libraries/kerberos/krb5.nix
This commit is contained in:
Shea Levy 2013-05-04 18:28:48 -04:00
commit fde3526e7d
352 changed files with 5595 additions and 587 deletions

View File

@ -1,5 +1,5 @@
{ stdenv, fetchgit, alsaLib, fftwSinglePrec, freetype, jackaudio
, libxslt, lv2, pkgconfig, premake, xlibs }:
, libxslt, lv2, pkgconfig, premake3, xlibs }:
let
rev = "99efbf0b";
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
'';
buildInputs = [
alsaLib fftwSinglePrec freetype jackaudio pkgconfig premake
alsaLib fftwSinglePrec freetype jackaudio pkgconfig premake3
xlibs.libX11 xlibs.libXcomposite xlibs.libXcursor xlibs.libXext
xlibs.libXinerama xlibs.libXrender
];

View File

@ -1,18 +1,17 @@
{ stdenv, fetchurl, emacs, texinfo, unzip }:
{ stdenv, fetchurl, emacs, texinfo }:
let
version = "1.2.0";
in
stdenv.mkDerivation {
stdenv.mkDerivation rec {
name = "magit-${version}";
src = fetchurl {
url = "https://github.com/magit/magit/zipball/${version}";
sha256 = "1877s8ikvcb457mmljmw366h6pgg4zzx98qfazhqj8snl4yqsj4i";
name = "magit-${version}.zip";
url = "https://github.com/downloads/magit/magit/${name}.tar.gz";
sha256 = "1a8vvilhd5y5vmlpsh194qpl4qlg0a1brylfscxcacpfp0cmhlzg";
};
buildInputs = [ emacs texinfo unzip ];
buildInputs = [ emacs texinfo ];
configurePhase = "makeFlagsArray=( PREFIX=$out SYSCONFDIR=$out/etc )";

View File

@ -1,32 +1,40 @@
{stdenv, fetchgit, qt4, bison, flex, eigen, boost, mesa, glew, opencsg, cgal
{stdenv, fetchurl, qt4, bison, flex, eigen, boost, mesa, glew, opencsg, cgal
, mpfr, gmp
}:
stdenv.mkDerivation rec {
version = "git-20121213";
version = "2013.01";
name = "openscad-${version}";
# src = fetchurl {
# url = "https://github.com/downloads/openscad/openscad/${name}.src.tar.gz";
# sha256 = "0gaqwzxbbzc21lhb4y26j8g0g28dhrwrgkndizp5ddab5axi4zjh";
# };
src = fetchgit {
url = "https://github.com/openscad/openscad.git";
rev = "c0612a9ed0899c96963e04c848a59b0164a689a2";
sha256 = "1zqiwk1cjbj7sng9sdarbrs0zxkn9fsa84dyv8n0zlyh40s7kvw2";
};
src = fetchurl {
url = "https://openscad.googlecode.com/files/${name}.src.tar.gz";
sha256 = "01r013l8zyfkgmqn05axh3rlfsjwd6j403w5ffl7nby4i2spiw1f";
};
buildInputs = [qt4 bison flex eigen boost mesa glew opencsg cgal gmp mpfr];
configurePhase = ''
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$(echo ${eigen}/include/eigen*) "
qmake PREFIX="$out"
qmake PREFIX="$out" VERSION=${version}
'';
doCheck = false;
meta = {
description = "3D parametric model compiler";
longDescription = ''
OpenSCAD is a software for creating solid 3D CAD objects. It is free
software and available for Linux/UNIX, MS Windows and Mac OS X.
Unlike most free software for creating 3D models (such as the famous
application Blender) it does not focus on the artistic aspects of 3D
modelling but instead on the CAD aspects. Thus it might be the
application you are looking for when you are planning to create 3D models of
machine parts but pretty sure is not what you are looking for when you are more
interested in creating computer-animated movies.
'';
homepage = "http://openscad.org/";
license = stdenv.lib.licenses.gpl2;
platforms = with stdenv.lib.platforms;
linux;
maintainers = with stdenv.lib.maintainers;

View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, gtk, girara, gettext, docutils }:
{ stdenv, fetchurl, pkgconfig, gtk, girara, gettext, docutils, file, makeWrapper }:
stdenv.mkDerivation rec {
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "1ja2j9ygymr259fxf02j1vkvalypac48gpadq8fn3qbclxxj61k5";
};
buildInputs = [ pkgconfig gtk girara gettext ];
buildInputs = [ pkgconfig gtk girara gettext makeWrapper ];
# Bug in zathura build system: we should remove empty manfiles in order them
# to be compiled properly
@ -22,6 +22,10 @@ stdenv.mkDerivation rec {
makeFlags = [ "PREFIX=$(out)" "RSTTOMAN=${docutils}/bin/rst2man.py" "VERBOSE=1" ];
postInstall = ''
wrapProgram "$out/bin/zathura" --prefix PATH ":" "${file}/bin"
'';
meta = {
homepage = http://pwmt.org/projects/zathura/;
description = "A core component for zathura PDF viewer";

View File

@ -0,0 +1,49 @@
{ stdenv, fetchurl, patchelf }:
# this package contains the daemon version of bittorrent sync
# it's unfortunately closed source.
let
# TODO: arm, ppc, osx
arch = if stdenv.system == "x86_64-linux" then "x64"
else if stdenv.system == "i686-linux" then "i386"
else throw "Bittorrent Sync for: ${stdenv.system} not supported!";
interpreter = if stdenv.system == "x86_64-linux" then "ld-linux-x86-64.so.2"
else if stdenv.system == "i686-linux" then "ld-linux.so.2"
else throw "Bittorrent Sync for: ${stdenv.system} not supported!";
version = "1.0.116";
sha256 = if stdenv.system == "x86_64-linux" then "108c11x8lp0a4irq88raclz3zfvmkxsqymxx3y8amc1lc6kc3n8i"
else if stdenv.system == "i686-linux" then "0kkxi04rggq6lrvn7g1xjay2nskqn7z4qkm0h0lcra7h2jz09mf1"
else throw "Bittorrent Sync for: ${stdenv.system} not supported!";
in stdenv.mkDerivation {
name = "btsync-bin-${version}";
src = fetchurl {
# TODO: using version-specific URL: http://forum.bittorrent.com/topic/18070-versioned-binary-downloads/#entry45868
url = "http://btsync.s3-website-us-east-1.amazonaws.com/btsync_${arch}.tar.gz";
inherit sha256;
};
sourceRoot = ".";
installPhase = ''
ensureDir "$out/bin/"
cp -r "btsync" "$out/bin/"
patchelf --set-interpreter ${stdenv.glibc}/lib/${interpreter} \
"$out/bin/btsync"
'';
buildInputs = [ patchelf ];
meta = {
homepage = "http://labs.bittorrent.com/experiments/sync.html";
description = "Automatically sync files via secure, distributed technology.";
license = stdenv.lib.licenses.unfreeRedistributable;
maintainers = [ stdenv.lib.maintainers.iElectric ];
};
}

View File

@ -13,13 +13,7 @@
, gcc, bison, gperf
, glib, gtk, dbus_glib
, libXScrnSaver, libXcursor, mesa
, protobuf
# dependencies for v25 only
, libvpx
# dependencies for >= v26
, speechd, libXdamage
, protobuf, speechd, libXdamage
# dependencies for >= v27
, libXtst
@ -69,7 +63,7 @@ let
use_system_xdg_utils = true;
use_system_yasm = true;
use_system_zlib = false; # http://crbug.com/143623
use_system_protobuf = post25;
use_system_protobuf = true;
use_system_harfbuzz = false;
use_system_icu = false;
@ -77,9 +71,6 @@ let
use_system_skia = false;
use_system_sqlite = false; # http://crbug.com/22208
use_system_v8 = false;
} // optionalAttrs pre26 {
use_system_libvpx = true;
use_system_protobuf = true;
};
defaultDependencies = [
@ -90,10 +81,10 @@ let
libusb1 libexif
];
pre26 = versionOlder sourceInfo.version "26.0.0.0";
pre27 = versionOlder sourceInfo.version "27.0.0.0";
post25 = !pre26;
pre28 = versionOlder sourceInfo.version "28.0.0.0";
post26 = !pre27;
post27 = !pre28;
in stdenv.mkDerivation rec {
name = "${packageName}-${version}";
@ -116,14 +107,12 @@ in stdenv.mkDerivation rec {
krb5
glib gtk dbus_glib
libXScrnSaver libXcursor mesa
pciutils protobuf
pciutils protobuf speechd libXdamage
] ++ optional gnomeKeyringSupport libgnome_keyring
++ optionals gnomeSupport [ gconf libgcrypt ]
++ optional enableSELinux libselinux
++ optional cupsSupport libgcrypt
++ optional pulseSupport pulseaudio
++ optional pre26 libvpx
++ optionals post25 [ speechd libXdamage ]
++ optional post26 libXtst;
opensslPatches = optional useOpenSSL openssl.patches;
@ -138,9 +127,11 @@ in stdenv.mkDerivation rec {
sed -i -r -e 's/-f(stack-protector)(-all)?/-fno-\1/' build/common.gypi
'' + optionalString useOpenSSL ''
cat $opensslPatches | patch -p1 -d third_party/openssl/openssl
'' + optionalString post25 ''
'' + ''
sed -i -e 's|/usr/bin/gcc|gcc|' \
third_party/WebKit/Source/WebCore/WebCore.gyp/WebCore.gyp
third_party/WebKit/Source/${if post27
then "core/core.gyp/core.gyp"
else "WebCore/WebCore.gyp/WebCore.gyp"}
'';
gypFlags = mkGypFlags (gypFlagsUseSystemLibs // {

View File

@ -1,14 +1,14 @@
# This file is autogenerated from update.sh in the same directory.
{
dev = {
version = "27.0.1453.47";
url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-27.0.1453.47.tar.xz";
sha256 = "0dyyxdn75a6b35a7wv9xqzcnskbcxj19bmfd7cq9ya5jdhcvy9j9";
version = "28.0.1485.0";
url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-28.0.1485.0.tar.xz";
sha256 = "04whky5bwsj909cc1ycwrc91d04iynwncwh21cbbbvg93jsj2pq9";
};
beta = {
version = "27.0.1453.47";
url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-27.0.1453.47.tar.xz";
sha256 = "0dyyxdn75a6b35a7wv9xqzcnskbcxj19bmfd7cq9ya5jdhcvy9j9";
version = "27.0.1453.65";
url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-27.0.1453.65.tar.xz";
sha256 = "1flv9870p0bqglnbm4gfzbxzcvz30k2chxgnlbqgpfk5c4qq9mpb";
};
stable = {
version = "26.0.1410.63";

View File

@ -47,18 +47,18 @@ stdenv.mkDerivation rec {
name = "google-talk-plugin-${version}";
# Use the following to determine the current upstream version:
# curl -s http://dl.google.com/linux/talkplugin/deb/dists/stable/main/binary-amd64/Packages | sed -nr 's/^Version: *([^ ]+)-1$/\1/p'
version = "3.10.2.0";
version = "3.17.0.0";
src =
if stdenv.system == "x86_64-linux" then
fetchurl {
url = "${baseURL}/google-talkplugin_${version}-1_amd64.deb";
sha256 = "0ivjmqrxy3xkwqjp20aqz47smdcdds0i82pfyb5k9jywi8afvchr";
sha256 = "1annx2zhxgn3wl468w7sk93k4xhmnx5bbdjr0d1ar7979hvrdl1x";
}
else if stdenv.system == "i686-linux" then
fetchurl {
url = "${baseURL}/google-talkplugin_${version}-1_i386.deb";
sha256 = "1bac95r9721sc7fsklsmv0lq673901zppdgabjjarpnx8z280jvj";
sha256 = "13fza920vg3qig2pnlr65mzcmmy3izla95zdpa3pk28qlfij0ryc";
}
else throw "Google Talk does not support your platform.";

View File

@ -1,23 +1,30 @@
{ stdenv, fetchurl, dbus, gnutls2, wxGTK28, libidn, tinyxml, gettext, pkgconfig, xdg_utils, gtk2, sqlite36 }:
{ stdenv, fetchurl, dbus, gnutls2, wxGTK28, libidn, tinyxml, gettext, pkgconfig, xdg_utils, gtk2, sqlite }:
let version = "3.6.0.2"; in
stdenv.mkDerivation {
name = "filezilla-${version}";
src = fetchurl {
url = "mirror://sourceforge/project/filezilla/FileZilla_Client/${version}/FileZilla_${version}_src.tar.bz2";
sha256 = "01n6k1q21i21451rdx3rgc4hhxghdn5b0ldzpjsp44ipgww5wsjk";
};
configureFlags = [
"--disable-manualupdatecheck"
];
buildInputs = [ dbus gnutls2 wxGTK28 libidn tinyxml gettext pkgconfig xdg_utils gtk2 sqlite36 ];
buildInputs = [ dbus gnutls2 wxGTK28 libidn tinyxml gettext pkgconfig xdg_utils gtk2 sqlite ];
meta = {
homepage = "http://filezilla-project.org/";
description = "FileZilla is a cross-platform graphical FTP, FTPS and SFTP client a lot of features, supporting Windows, Linux, Mac OS X and more.";
description = "Graphical FTP, FTPS and SFTP client";
license = "GPLv2";
longDescription = ''
FileZilla Client is a free, open source FTP client. It supports
FTP, SFTP, and FTPS (FTP over SSL/TLS). The client is available
under many platforms, binaries for Windows, Linux and Mac OS X are
provided.
'';
};
}

View File

@ -1,4 +1,4 @@
{ fetchurl, stdenv, bash, emacs, gdb, glib, gmime, gnupg1,
{ fetchurl, stdenv, bash, emacs, gdb, glib, gmime, gnupg,
pkgconfig, talloc, xapian
}:
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "03cwylm0y9xld0hn753v0hn62f96nagdmzxv8jlz8vdbh9iszs56";
};
buildInputs = [ bash emacs gdb glib gmime gnupg1 pkgconfig talloc xapian ];
buildInputs = [ bash emacs gdb glib gmime gnupg pkgconfig talloc xapian ];
patchPhase = ''
(cd test && for prg in \
@ -55,6 +55,14 @@ stdenv.mkDerivation rec {
substituteInPlace "$prg" \
--replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
done)
for src in \
crypto.c \
emacs/notmuch-crypto.el
do
substituteInPlace "$src" \
--replace \"gpg\" \"${gnupg}/bin/gpg2\"
done
'';
# XXX: emacs tests broken

View File

@ -40,6 +40,7 @@ stdenv.mkDerivation {
cp dist/freenet.jar $out/share/freenet
cat <<EOF > $out/bin/freenet
#!${stdenv.shell}
${jre}/bin/java -cp $out/share/freenet/bcprov.jar:$out/share/freenet/freenet-ext.jar:$out/share/freenet/freenet.jar \\
-Xmx1024M freenet.node.NodeStarter
EOF

View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "hledger-interest";
version = "1.4.2";
sha256 = "1his6pxrvs5p28bmk77bd8vaq6rhjlilwq598mbkgfvlqg7q076v";
version = "1.4.3";
sha256 = "1nj50zi4p6rs0nl4656rr0vkbh7kdi49z1l53nypfqs3rmjgicsn";
isLibrary = false;
isExecutable = true;
buildDepends = [ Cabal hledgerLib mtl time ];

View File

@ -1,36 +1,22 @@
{ stdenv, fetchgit, python, autoconf, automake, libtool, gettext, emacs, gmp
, pcre, expat, boost, mpfr, git, texinfo }:
{ stdenv, fetchgit, cmake, boost, gmp, mpfr, libedit, python, texinfo }:
let
rev = "d2915c66";
rev = "2c7ab8be";
in
stdenv.mkDerivation {
name = "ledger3-2012.01.${rev}";
name = "ledger3-2013.04.${rev}";
src = fetchgit {
url = "git://github.com/jwiegley/ledger.git";
inherit rev;
sha256 = "a489c8b1c48889040d2cebaac1a0019e90acac0b51c9abf7914944dcb4b801e7";
sha256 = "1ng5ymzqzbgdrn2ghhr7jvcjv5y7ikhyck5p1yv5j024s17xdyj5";
};
buildInputs = [
python autoconf automake libtool gettext emacs gmp pcre expat boost mpfr
git texinfo
];
buildInputs = [ cmake boost gmp mpfr libedit python texinfo ];
CPPFLAGS = "-I${gmp}/include -I${mpfr}/include";
LDFLAGS = "-L${gmp}/lib -L${mpfr}/lib";
buildPhase = ''
sed -i acprep \
-e 's|search_prefixes = .*|search_prefixes = ["${boost}"]|' \
-e 's|/usr/bin/python|${python}/bin/python|'
export MAKEFLAGS="-j$NIX_BUILD_CORES -l$NIX_BUILD_CORES"
python acprep update --no-pch --prefix=$out
'';
doCheck = !stdenv.isDarwin;
# Unit tests fail in the current git snapshot. Try enabling them again
# when updating this package!
doCheck = false;
enableParallelBuilding = true;

View File

@ -3,11 +3,11 @@ let
s = # Generated upstream information
rec {
baseName="eprover";
version="1.6";
version="1.7";
name="${baseName}-${version}";
hash="140cnw4qck1hancrqdh0f77yfba5ljhdnfxdxsl0a86a6y7ydbwi";
url="http://www4.in.tum.de/~schulz/WORK/E_DOWNLOAD/V_1.6/E.tgz";
sha256="140cnw4qck1hancrqdh0f77yfba5ljhdnfxdxsl0a86a6y7ydbwi";
hash="1prkgjpg8lajcylz9nj2hfjxl3l42cqbfvilg30z9b5br14l36rh";
url="http://www4.in.tum.de/~schulz/WORK/E_DOWNLOAD/V_1.7/E.tgz";
sha256="1prkgjpg8lajcylz9nj2hfjxl3l42cqbfvilg30z9b5br14l36rh";
};
in
stdenv.mkDerivation {

View File

@ -0,0 +1,20 @@
{ stdenv, fetchurl, libextractor, gettext }:
stdenv.mkDerivation rec {
name = "doodle-0.7.0";
buildInputs = [ libextractor gettext ];
src = fetchurl {
url = "http://grothoff.org/christian/doodle/download/${name}.tar.gz";
sha256 = "0ayx5q7chzll9sv3miq35xl36r629cvgdzphf379kxzlzhjldy3j";
};
meta = {
homepage = http://grothoff.org/christian/doodle/;
description = "Tool to quickly index and search documents on a computer";
license = "GPLv2+";
maintainers = with stdenv.lib.maintainers; [viric];
platforms = with stdenv.lib.platforms; linux;
};
}

View File

@ -10,7 +10,7 @@ rec {
git = lib.makeOverridable (import ./git) {
inherit fetchurl stdenv curl openssl zlib expat perl python gettext gnugrep
asciidoc texinfo xmlto docbook2x docbook_xsl docbook_xml_dtd_45 libxslt
cpio tcl tk makeWrapper subversionClient hardlink gzip;
cpio tcl tk makeWrapper subversionClient gzip;
svnSupport = false; # for git-svn support
guiSupport = false; # requires tcl/tk
sendEmailSupport = false; # requires plenty of perl libraries

View File

@ -10,14 +10,14 @@
}:
let
version = "4.20130405";
version = "4.20130501";
in
stdenv.mkDerivation {
name = "git-annex-${version}";
src = fetchurl {
url = "http://git.kitenet.net/?p=git-annex.git;a=snapshot;sf=tgz;h=${version}";
sha256 = "13lzkvk5095qj8026lc1p56w0q1c95v7nx8g9p9zrf8mhx6yxb9n";
sha256 = "0g89lmkrs02qdb1k1bfq9gz3j4yv35320vb8ddmj99f4nnhqc6vv";
name = "git-annex-${version}.tar.gz";
};

View File

@ -1,6 +1,6 @@
{ fetchurl, stdenv, curl, openssl, zlib, expat, perl, python, gettext, cpio, gnugrep, gzip
, asciidoc, texinfo, xmlto, docbook2x, docbook_xsl, docbook_xml_dtd_45
, libxslt, tcl, tk, makeWrapper, hardlink
, libxslt, tcl, tk, makeWrapper
, svnSupport, subversionClient, perlLibs, smtpPerlLibs
, guiSupport
, withManual ? true
@ -10,7 +10,7 @@
let
version = "1.8.2";
version = "1.8.2.1";
svn = subversionClient.override { perlBindings = true; };
@ -21,10 +21,10 @@ stdenv.mkDerivation {
src = fetchurl {
url = "http://git-core.googlecode.com/files/git-${version}.tar.gz";
sha256 = "1rhkya4kfs7iayasgj3bk8zg1pfk3h7wqhfy9d6aaqjgzb75pwy2";
sha1 = "ad9f833e509ba31c83efe336fd3599e89a39394b";
};
patches = [ ./docbook2texi.patch ];
patches = [ ./docbook2texi.patch ./symlinks-in-bin.patch ];
buildInputs = [curl openssl zlib expat gettext cpio makeWrapper]
++ stdenv.lib.optionals withManual [ asciidoc texinfo xmlto docbook2x
@ -42,6 +42,8 @@ stdenv.mkDerivation {
# so that `SPARSE_FLAGS' corresponds to the current architecture...
#doCheck = true;
installFlags = "NO_INSTALL_HARDLINKS=1";
postInstall =
''
notSupported() {
@ -119,15 +121,10 @@ stdenv.mkDerivation {
done
'');
# Git installs many copies of the same binary using hardlinks, but unfortunately
# our patchELF phase re-writes those files and destroys the hardlinks in the
# process. This utility re-generates them afterwards.
postFixup = "${hardlink}/bin/hardlink $out";
enableParallelBuilding = true;
meta = {
homepage = "http://git-scm.com/";
homepage = http://git-scm.com/;
description = "Git, a popular distributed version control system";
license = stdenv.lib.licenses.gpl2Plus;

View File

@ -0,0 +1,13 @@
diff -ru -x '*~' git-1.8.2.1-orig/Makefile git-1.8.2.1/Makefile
--- git-1.8.2.1-orig/Makefile 2013-04-08 00:52:04.000000000 +0200
+++ git-1.8.2.1/Makefile 2013-04-22 15:46:42.906026940 +0200
@@ -2319,8 +2319,7 @@
{ test "$$bindir/" = "$$execdir/" || \
for p in git$X $(filter $(install_bindir_programs),$(ALL_PROGRAMS)); do \
$(RM) "$$execdir/$$p" && \
- test -z "$(NO_INSTALL_HARDLINKS)$(NO_CROSS_DIRECTORY_HARDLINKS)" && \
- ln "$$bindir/$$p" "$$execdir/$$p" 2>/dev/null || \
+ ln -s "$$bindir/$$p" "$$execdir/$$p" 2>/dev/null || \
cp "$$bindir/$$p" "$$execdir/$$p" || exit; \
done; \
} && \

View File

@ -21,13 +21,13 @@ assert compressionSupport -> neon.compressionSupport;
stdenv.mkDerivation rec {
version = "1.7.8";
version = "1.7.9";
name = "subversion-${version}";
src = fetchurl {
url = "mirror://apache/subversion//${name}.tar.bz2";
sha1 = "12c7d8d5414bba74c9777c4d1dae74f152df63c2";
sha1 = "453757bae78a800997559f2232483ab99238ec1e";
};
buildInputs = [ zlib apr aprutil sqlite ]

View File

@ -4,7 +4,6 @@
, libvorbis
, file
, boost
, lzo
, xdg_utils
, expat
, wxGTK
@ -16,14 +15,14 @@
}:
stdenv.mkDerivation rec {
name = "mkvtoolnix-6.1.0";
name = "mkvtoolnix-6.2.0";
src = fetchurl {
url = "http://www.bunkus.org/videotools/mkvtoolnix/sources/${name}.tar.xz";
sha256 = "01k5al3886cyi97kynx5hf98z5p7mb8vd2m057gbp1k10zblcb9x";
sha256 = "0864vmdcnfwk5cb2fv1y60yvp9kqcyaqxwbvy4nsj7bzwv1iqysn";
};
buildInputs = [ libmatroska flac libvorbis file boost lzo xdg_utils expat wxGTK zlib ruby gettext pkgconfig curl ];
buildInputs = [ libmatroska flac libvorbis file boost xdg_utils expat wxGTK zlib ruby gettext pkgconfig curl ];
configureFlags = "--with-boost-libdir=${boost}/lib";
buildPhase = ''

View File

@ -96,7 +96,9 @@ assert enableCheckPhase -> stdenv.lib.versionOlder "7" ghc.ghcVersion;
jailbreak = false;
# pass the '--enable-split-objs' flag to cabal in the configure stage
enableSplitObjs = !stdenv.isDarwin; # http://hackage.haskell.org/trac/ghc/ticket/4013
enableSplitObjs = !( stdenv.isDarwin # http://hackage.haskell.org/trac/ghc/ticket/4013
|| stdenv.lib.versionOlder "7.6.99" ghc.ghcVersion # -fsplit-ojbs is broken in 7.7 snapshot
);
# pass the '--enable-tests' flag to cabal in the configure stage
# and run any regression test suites the package might have

View File

@ -154,6 +154,7 @@ rec {
ftp://ftp.nl.uu.net/pub/CPAN/
http://ftp.funet.fi/pub/CPAN/
http://cpan.perl.org/
http://backpan.perl.org/ # for old releases
];
# Debian.

View File

@ -1322,6 +1322,40 @@ rec {
packages = commonDebPackages ++ [ "diffutils" ];
};
ubuntu1304i386 = {
name = "ubuntu-13.04-raring-i386";
fullName = "Ubuntu 13.04 Raring (i386)";
packagesLists =
[ (fetchurl {
url = mirror://ubuntu/dists/raring/main/binary-i386/Packages.bz2;
sha256 = "b7da6802c5302439d9abf05ebe1ab4c3b82d7be9356f51a12c5bf4994f009181";
})
(fetchurl {
url = mirror://ubuntu/dists/raring/universe/binary-i386/Packages.bz2;
sha256 = "1db19982fc3689b00a918e2cdbb936dfccebbac2ed82f81bb0164a3d51039012";
})
];
urlPrefix = mirror://ubuntu;
packages = commonDebPackages ++ [ "diffutils" "libc-bin" ];
};
ubuntu1304x86_64 = {
name = "ubuntu-13.04-raring-amd64";
fullName = "Ubuntu 13.04 Raring (amd64)";
packagesList =
[ (fetchurl {
url = mirror://ubuntu/dists/raring/main/binary-amd64/Packages.bz2;
sha256 = "9ee6a67bedbda80b668a868bb81b5b3f30bbabac01f69d2a08961c37c8536356";
})
(fetchurl {
url = mirror://ubuntu/dists/raring/universe/binary-amd64/Packages.bz2;
sha256 = "0caf561bad359e8a82a987a076c0f1cb7a43412a5de053c105b160477c192978";
})
];
urlPrefix = mirror://ubuntu;
packages = commonDebPackages ++ [ "diffutils" "libc-bin" ];
};
debian40i386 = {
name = "debian-4.0r9-etch-i386";
fullName = "Debian 4.0r9 Etch (i386)";

View File

@ -0,0 +1,11 @@
{ kde, kdelibs, kactivities, qjson, pyqt4, sip }:
kde {
#todo: PythonLibrary, SIP, PyQt4, PyKDE4
buildInputs = [ kdelibs kactivities qjson pyqt4 sip ];
meta = {
description = "Kate, the KDE Advanced Text Editor, as well as KWrite";
license = "GPLv2";
};
}

View File

@ -0,0 +1,11 @@
{ kde, kdelibs, kde_baseapps }:
kde {
buildInputs = [ kdelibs kde_baseapps ];
meta = {
description = "Konsole, the KDE terminal emulator";
license = "GPLv2";
};
}

View File

@ -0,0 +1,72 @@
{ callPackage, callPackageOrig, stdenv, qt48 }:
let
release = "4.10.2";
# Need callPackageOrig to avoid infinite cycle
kde = callPackageOrig ./kde-package {
inherit release ignoreList extraSubpkgs callPackage;
};
# The list of igored individual modules
ignoreList = {
# Doesn't work yet
kdeutils = [ "ksecrets" ];
# kdeadmin/strigi-analyzer has no real code
kdeadmin = [ "strigi-analyzer" ];
# fake package to make things just work
kdesdk = [ "fake" ];
# Most of kdebindings do not compile due to a bug in the buildsystem
kdebindings = [ "kimono" "korundum" "kross-interpreters" "perlkde" "qyoto" ];
};
# Extra subpackages in the manifest format
extraSubpkgs = {
kdesdk = [
{ name="cervisia"; }
{ name="lokalize"; }
{ name = "kioslave-svn"; sane = "kioslave_svn"; subdir = "kioslave"; }
{ name = "kioslave-perldoc"; sane = "kioslave_perldoc"; subdir = "kioslave"; }
{ name="dolphin-plugins-svn"; sane="dolphin_plugins_svn";subdir="dolphin-plugins/svn"; }
{ name="dolphin-plugins-git"; sane="dolphin_plugins_git";subdir="dolphin-plugins/git"; }
{ name="dolphin-plugins-hg"; sane="dolphin_plugins_hg";subdir="dolphin-plugins/hg"; }
{ name="dolphin-plugins-bazaar"; sane="dolphin_plugins_bazaar";subdir="dolphin-plugins/bazaar"; }
{ name="kcachegrind"; }
{ name="kapptemplate"; }
{ name="kdesdk-strigi-analyzers"; sane="kdesdk_strigi_analyzers";}
{ name="kdesdk-thumbnailers"; sane="kdesdk_thumbnailers";}
{ name="okteta"; }
{ name="kompare"; }
{ name="poxml"; }
{ name="kde-dev-scripts"; sane = "kde_dev_scripts"; }
{ name="kde-dev-utils"; sane="kde_dev_utils";}
#{ name="kprofilemethod"; subdir = "kde-dev-utils/kprofilemethod";}
#{ name="kstartperf"; }
#{ name="kmtrace"; subdir = "kde-dev-utils/kmtrace"; }
#{ name="kpartloader"; }
#{ name="kuiviewer"; }
{ name="umbrello"; }
];
};
in
kde.modules // kde.individual //
{
inherit (kde) manifest modules individual splittedModuleList;
akonadi = callPackage ./support/akonadi { };
qt4 = qt48;
kdebase_workspace = kde.modules.kde_workspace;
inherit release;
full = stdenv.lib.attrValues kde.modules;
l10n = callPackage ./l10n {
inherit release;
inherit (kde.manifest) stable;
};
}

View File

@ -0,0 +1,17 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3d3e247..f78db67 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,10 @@
-find_package(KDE4 REQUIRED)
-include(KDE4Defaults)
+project(kde-wallpapers NONE)
+if( WALLPAPER_INSTALL_DIR )
+ message(STATUS "Installing wallpapers to user-supplied directory ${WALLPAPER_INSTALL_DIR}")
+else()
+ find_package(KDE4 REQUIRED)
+ include(KDE4Defaults)
+endif()
install(DIRECTORY Air DESTINATION ${WALLPAPER_INSTALL_DIR} PATTERN .svn EXCLUDE)

View File

@ -0,0 +1,12 @@
diff -ru -x '*~' kdelibs-4.6.90-orig/kdecore/auth/ConfigureChecks.cmake kdelibs-4.6.90/kdecore/auth/ConfigureChecks.cmake
--- kdelibs-4.6.90-orig/kdecore/auth/ConfigureChecks.cmake 2011-05-20 22:24:54.000000000 +0200
+++ kdelibs-4.6.90/kdecore/auth/ConfigureChecks.cmake 2011-07-12 14:03:00.000000000 +0200
@@ -139,7 +139,7 @@
${CMAKE_INSTALL_PREFIX} _KDE4_AUTH_POLICY_FILES_INSTALL_DIR
${POLKITQT-1_POLICY_FILES_INSTALL_DIR})
- set(KDE4_AUTH_POLICY_FILES_INSTALL_DIR ${_KDE4_AUTH_POLICY_FILES_INSTALL_DIR} CACHE STRING
+ set(KDE4_AUTH_POLICY_FILES_INSTALL_DIR "\${CMAKE_INSTALL_PREFIX}/share/polkit-1/actions" CACHE STRING
"Where policy files generated by KAuth will be installed" FORCE)
elseif(KDE4_AUTH_BACKEND_NAME STREQUAL "FAKE")
set (KAUTH_COMPILING_FAKE_BACKEND TRUE)

View File

@ -0,0 +1,9 @@
{ kde, kdelibs, nepomuk_core }:
kde {
propagatedBuildInputs = [ kdelibs nepomuk_core ];
meta = {
description = "KDE activities library and daemon";
};
}

View File

@ -0,0 +1,14 @@
{ kde, kdelibs }:
kde {
outputHashAlgo = "sha256";
outputHashMode = "recursive";
outputHash = "0mrd3w7rhsj0v92c8rh9zjxyifq7wyvwszksf2gyn53dzd06blk8";
buildInputs = [ kdelibs ];
meta = {
description = "KDE Base artwork";
license = "GPL";
};
}

View File

@ -0,0 +1,11 @@
{ kde, kdelibs, shared_desktop_ontologies, glib, htmlTidy, kactivities
, nepomuk_core, nepomuk_widgets, libXt }:
kde {
buildInputs = [ kdelibs nepomuk_core nepomuk_widgets htmlTidy kactivities libXt ];
meta = {
description = "Base KDE applications, including the Dolphin file manager and Konqueror web browser";
license = "GPLv2";
};
}

View File

@ -0,0 +1,399 @@
{stable=true;
hashes=builtins.listToAttrs[
{name="analitza";value="1k950n7rq081qy2pv7cbwzr81qp6bifll7cddgwgxk9kv16wrmh1";}
{name="ark";value="11jfdw4hkma564r6b9mn6vn2h5s6b6mf4imjad6iw7z3lxq6v7w9";}
{name="audiocd-kio";value="0zgil29ig2n5km3wzsx0gpwxk7l6zpcnxqgws9mgaqm3vnfqcjh6";}
{name="blinken";value="19jxlqalxfbxh1dshgpdyjkb8n7bynfr09p4hy38kv6nfil890y8";}
{name="bomber";value="08g82id9sf1m9zg38k47vannqcpm3fmskpgz4j41bcn24yfwynvf";}
{name="bovo";value="1zsbly04bcn00gyl751vszw82pvakdlw6l1n67hsgg3h5wa5z1fb";}
{name="cantor";value="1f3xwl9da0cz25qrx47p9b1bkcsbdj4i740py6awvhrrq60s0870";}
{name="dragon";value="0f9ma8aaglxh91inm711y64xqscxlqfil53gpk8c1bbanb8m99xp";}
{name="ffmpegthumbs";value="12fljrxyv8zgr1vl0ki8hxahwm4dn15pqhb1xgkw5pld0lvcq4sy";}
{name="filelight";value="0jiahda52k4knka4b0an4g2brbp263b2q8c09ayzmcd4mp9a4cgv";}
{name="granatier";value="0npp24j7bxmnfi743qsjn4ymi5b5icli0fb6g4x2f713z7i6raf8";}
{name="gwenview";value="1bznjfki05mydgjb3bmj5dymh33rac9lxrzlczqmah87c0f8fbc7";}
{name="jovie";value="17fbyja7ffsx0q6wlls9lagfcv8b21cnjnww06k90cyg0vn7sng4";}
{name="juk";value="0ni0iqprfrypx1iwgphhxwyw9216nc5s7hb0hv5j3v2kl1v2ir2n";}
{name="kaccessible";value="1zqbs26nl6wxnkya6nqzvnjfwmsqciraixi1awra4nzzx7n736rg";}
{name="kactivities";value="1d0xalwk2hlz0xxfgkrkfp0kgl347psgfhixsl8axhjgfxxi3bmx";}
{name="kajongg";value="1k401zxhkw8nha69kqr5igfwfgzlbmlvsy24fn4m2h2k1sh3vdcj";}
{name="kalgebra";value="1dzj9m6rm07xfr7plf9f7qrs44fzs4j9ncj02h9hzjli7zb44c3p";}
{name="kalzium";value="03zwwsbnizqm23zrhh5iagayw7jynmx87fwv0piiz65mgn4kxr5p";}
{name="kamera";value="1qvq4flqw1hw3513mcqdhsdvvr12sac272lhaf3jzxsm7p1qc3p1";}
{name="kanagram";value="0b5h2b8jm9zssn1hcl0wzf3mh11yh5hhaiay1i5db9k9g6y2nbn1";}
{name="kapman";value="1ghlfhmjivxnbga255x2lcdi6kxddyb3hnq93n6bzpg30m4j95sx";}
{name="kate";value="0cfdpg5j0zfi1zi0cjq8m3lgnbc9pwb2wlr9dvm4m0hy7byp88p3";}
{name="katomic";value="1r2nxya5c6dazvi7810hr24ydkyyb11ganbxkc4d1m8735i6fbqw";}
{name="kblackbox";value="0hslyixnw5bb2z71jncahjhnnf08baid8vxsp9n6a4ckcvbmldw4";}
{name="kblocks";value="1ds06amafp2igkhcjlwmaszbdvx4kfzlqpx57r5r4nlypnqfvv7k";}
{name="kbounce";value="0qp5ayyv3vacr2vak797wzxvkl5b9wn3db1rrzldiixb067f8jzy";}
{name="kbreakout";value="1ywk8zwpgqichq12idracld1gjv8gzhfyzxfi1n7165jyqqf9ba6";}
{name="kbruch";value="0vr1pbh7ds30vys3gd71c056fc96m5jpi7ihdbvm96p0bz94s7s4";}
{name="kcalc";value="1wni970xvd0inpxgw6mb85h6j9acp8vv62v7ipxcm4s4ay5jj9n1";}
{name="kcharselect";value="1rigpqyykd9s3gsai61y0jm6vbcza9gafwr2a4kgr72w7rn767fk";}
{name="kcolorchooser";value="0k60hbx41snpx83ivmnakl0a4li72pdimbgg987pl9ydjb7ja8gy";}
{name="kdeadmin";value="1a6412g8083g9b1xf75cwf0x3x3szadcqw3r4415vxww6kmb8br1";}
{name="kdeartwork";value="0a12fcmvhbc11vlmgds43mqbc6zf5j00dpsnj27ylz0nckjlajlb";}
{name="kde-baseapps";value="1gmyy9lkgcjhhbffzq51rjqr4m59x16qcsplcyywz218zr28gpfs";}
{name="kde-base-artwork";value="1vz5y6qb1wy3vcinnbsxydy39gz2ifls56dyg082j2f709hijzy3";}
{name="kdegraphics-mobipocket";value="0nf2k94bz8iqrr60zrql5mg14q14przq5lxscm71kk1bhdh711si";}
{name="kdegraphics-strigi-analyzer";value="10l1bmnskmfrwln78pzagfhz5kc2nipdm57i1c3fyp15d0msdgjz";}
{name="kdegraphics-thumbnailers";value="0p6bmllgzamfc3f9vigdq8knlblsmp4308lhh4f5bw5wkncjglqg";}
{name="kdelibs";value="1bylppbp6bzqyhkw5cavccmxh6zixjzc3z4g28d2lqixga1l16qz";}
{name="kdenetwork";value="0kjjwj69a79rfx7z3qxp5gjpykqq3nkwr5cm50f0phsfnflzx9l8";}
{name="kdepim";value="14q30gf3al23sx7cf8mhp89xa5c5xd1ns7dwq26igzkvji79kwlk";}
{name="kdepimlibs";value="1m56ljhssdj581hsb4irkgi6dwx25s5x8axk4fpipzvj6dq6yplz";}
{name="kdepim-runtime";value="1c9wv2wr843090jg41dwhqmvvvzqw875asmvydhj6kw625k62hr1";}
{name="kdeplasma-addons";value="1n1yar1rqw3swfnjmazqs1qm7yg19pki97204xa8dnlispbqk21s";}
{name="kde-runtime";value="0gmirvzs5cvh6rzps59hqkj4zk3nixh7i5hrxmm1ib7g1qnh0kfg";}
{name="kdesdk";value="1nyff19fv186n1j14qpvgslnaphl5y4rls8rn0yc0vxh31x769d9";}
{name="kdetoys";value="12c4h8vv5fd12k1wkbpmsf95c0gqa8nnwhszri72danal1qak7jj";}
{name="kde-wallpapers";value="17kavdzxql2cgpqrw0v9c2aflajv0l1qgllsg0l5qr7w68fqdjn7";}
{name="kdewebdev";value="0hv4ly6323f64wiqvizdn1ia0z50chhravm796wczb8xw8mcidh8";}
{name="kde-workspace";value="0rv8gdwlkvhajbn5s8mybrqc4ilpq4b0v7r55zp9dcb27c8jkr1n";}
{name="kdf";value="1bkj5yr7ds74gqlfsvyxf26kdqsyac8kg04phnc2rkzp31dvgldg";}
{name="kdiamond";value="1y1fyv211mvh5sbw55f827b7nx4da3aaly7c1bm2c13nnj7j5r9s";}
{name="kfloppy";value="063zzya13jmcdr2y3vig5k54hx1asnzs6lg2r5sckqp5lsmpdaz5";}
{name="kfourinline";value="1af58yrhpjhj61ppxfymw5z43ks9j5cz6ldagxiblp67w4bpa468";}
{name="kgamma";value="167z8ycnvi59kvmyar856hkcpb4znwhkkxvn4gg4g74byjzwlf3a";}
{name="kgeography";value="04p6ypf72gd2k54qaarsgyvji0bvsi0iqbbjr4qdyd9dhxihhzzp";}
{name="kgoldrunner";value="13m1j31fjiz6j0wfivkvgcmicz274h0jvdm8mkjzlp10g3691x4p";}
{name="kgpg";value="00zs8x2dhli8dlmj0365gq9517pzkpyf31kb4398zfrrcmja2qip";}
{name="khangman";value="1wj439z0n6sy1l5vknh9nrq2d1q2bq5sh0963g1zb9hp8l13bf8a";}
{name="kig";value="0hhfvl38czabramgyxjlazqp4dlkkc859fs36wq042iip05kyy3q";}
{name="kigo";value="0bvcqsq8w983lnrgi85pjajb7phbg826ky50w5wk5vql1afl02c6";}
{name="killbots";value="08j9p8wyqpjj78b9sj13f4vhlkcrhc7sgzwakcv4bg2dvmpr95mp";}
{name="kimono";value="14z3ca8s7swwxwnm198bq4ndfsl2m0brc9k465k7rj50l15y0rhl";}
{name="kiriki";value="13cay0dllcf5618yjjs1hz3392hcig8bj7r09b0hbqhay65z9l5y";}
{name="kiten";value="0lrdkha6xmlxfq9f36rb5ysk8hg9m5zmc9x1y206gxk3rf3k1wzj";}
{name="kjumpingcube";value="179p3lw1vl9vxvsdwzx8qjfrahii0igakw0qrdpkcmx4yr0a9gfx";}
{name="klettres";value="149xgrxqbp2bq8v2abzhmb8w2b2ssd7xmb06j6k1s707wc9kcs5g";}
{name="klickety";value="00x4f4nxfi9xasrddnc84vayn36dd0chyl8jxryswg8dabzazb25";}
{name="klines";value="0vamlsz3a945zcm34gb3w0iq2rknwkh9cbv1syh3cc2s9dn5sg29";}
{name="kmag";value="06jcp2nhgqbw6yrr5xhajsy2lxklk31kjfmq0pphssfs9yhi1pan";}
{name="kmahjongg";value="07hj806mix703h9x676rnwmklrfms04hfxidvzl0324idjw6v5m9";}
{name="kmines";value="07nrv4qn7wg590id83dgw7l5kyh4prj3nbi9np4x9ik1rr5bq9nm";}
{name="kmix";value="1hwmn4rvr7jid4y3gycsvxvvfxmkv128jxsdfjdhzqz8lcp2q87q";}
{name="kmousetool";value="1mrhppgrwwr3cyr3fna0hgypclssixhw9yx6wvqgqj3sc5wd6n4f";}
{name="kmouth";value="1s7789qsvg18548bdhmmgcs3w9843naxhcwsiqhc8x0dvaxlgd5r";}
{name="kmplot";value="0jzrc47c4v6hvrs6p0yhki70diyfgs55vnjac4gfrfn17jgh562w";}
{name="knavalbattle";value="1mqvlvhqd7sa4qsz6cf6gffysamgfml3nd4h71x5qzw8qqw778yq";}
{name="knetwalk";value="14nizf7nrvsmqg6d5vaazl8wf74q64gwxq6nmj86brinf7d5nn5h";}
{name="kolf";value="1qghkmzbpaajb91xcwd22fx87cfpmgmjjwqisdzkjz4qn3z5mpx0";}
{name="kollision";value="1z0xg967q3l2gxmnigjbrnqwvw5fm7cpscpfavn31zp4vbmk937m";}
{name="kolourpaint";value="135i7h1lf23cggzx7l2p2hsh7s4zrik3298fwwbhly0jl564ribb";}
{name="konquest";value="133zjqqpzwrai34f8gb4nk3im50i61c2my8hnqzr61pbbgd61ff3";}
{name="konsole";value="1iaih9c6i5ad0bvalwykrdgrwz6wb7k6x808na1df0yynw76r4s7";}
{name="korundum";value="1h8rr229hwkckrvpz6zkkxpfkrpg18fvyxsqb01sjaky7c6i4649";}
{name="kpat";value="1imr9w6jymx4379ba7drpa9nmaq6z28hrf5jwi06crhp5fyi08dh";}
{name="kremotecontrol";value="0zzhjgpy17wrgcrr70z582zh7rj0n4vgbxksz7gl3qm543y15kry";}
{name="kreversi";value="0dmfsg38hhav78j4s34arjr09ahfblv4k7s8llpafg7cicm8g0iv";}
{name="kross-interpreters";value="043wpb05di9pw3h206lpccgpfghc4v23s0n2bwv30246ig75rmk1";}
{name="kruler";value="1g7f810d7940j9lylzj0k7d89mbblz8ai9gs5cc7n0mkrczb9ws9";}
{name="ksaneplugin";value="1svsfgsvd21f9fhrsvi2fasffrx0r5rf8a8r4jx19hlzcvha0kza";}
{name="kscd";value="1ipl9sq8zikdjs044lbi519jyvdaahi0f8a877zfdp0xspzqi398";}
{name="kshisen";value="06qkl8fwh8rql6hdl8fygvfybp7w6c3ys0qsnjpxk5bz4m5xap1d";}
{name="ksirk";value="1hqp00dilzkbkada7dc5j56sh2rp19xcirhvj26560whlwdxhcj5";}
{name="ksnakeduel";value="0nbn1pn0hzh6wmhxkabrga50y06k4gv4pbb5235jbynjmk539n31";}
{name="ksnapshot";value="09na29nydwi0cmgg9g6yqr3wl9npgiqpvdq3wxc5jk1kxadlb0aj";}
{name="kspaceduel";value="1xf5qb8a08ar0v0ws1iyiqbax6qc8crbhn59nzy2hrc12451lbkc";}
{name="ksquares";value="1iz9r80mnkyq5mx4i95gx5a5qk5y5by8bwq9599ypamrb9fr1zpl";}
{name="kstars";value="0p86fpcyb1ipgmi2ypckdb5zzwanky9b3c1n5ddcr25y84b2m7iy";}
{name="ksudoku";value="0k5qdy0i20kxcsqdwzxhrw6rn3lzh2mgbw97rlxw5gmr3619irdz";}
{name="ktimer";value="149zlkpdz38pfg0yy9mi6xkrc3wcz790kc3026x1c5zyvb2nnwm7";}
{name="ktouch";value="109dwxxz1hcwj5506k33a0zy86ky50rp058x6pgqh1m0a6ljvswi";}
{name="ktuberling";value="1vsdkx7kz4gz35g3ggn6h5gmk43sww7mawdfl4r11q5rq7r2nlnx";}
{name="kturtle";value="1jvj34jlbvzvwmr7q8c12rh9q47d78dl6vx6lhjhvs1b0969zzrq";}
{name="kubrick";value="1vqjbf6p6adrmnrl4i4y1jh80rimzlp4fyfmgscpfncdnc5pzgb0";}
{name="kwallet";value="0sc6xn1gyl2jvfqqvln2x4cb68b2x5cjmb8gvxhgwizx93jmwkc1";}
{name="kwordquiz";value="1i7kdfp8x1r109jmj1a86bmn69cgjc8q9c4n92j1imr17ig063is";}
{name="libkcddb";value="1krr3jh46q3q02rps3wawv59bv9jzri7i4gi4qgszk5v8gn67nqb";}
{name="libkcompactdisc";value="1y7sznz6sdrgs8jiqxs2y7imqywq91l46w1dv8fkc9mcpx5233zb";}
{name="libkdcraw";value="1nhhnj6hir347g6jp20k5jq0faygp8x9k3lic9ixdw2byigy9c3p";}
{name="libkdeedu";value="0m0ipprcldg1l2yi0hpq87npvqic9vfh6pn60fg4wvl56syn0sfg";}
{name="libkdegames";value="1qs59v68nwli5438ax3am6694r1c04i7crv34bs9hksnmr51l499";}
{name="libkexiv2";value="0n93d4s37m2jdg04wgvmljrs7j14967bjjk6mk7fibv0jqmp65i5";}
{name="libkipi";value="0kjp9y2rngvhskzk63az6zfzjrysir2qlapy56ynscdgq3yl0ygm";}
{name="libkmahjongg";value="0g7fp0wzrhxfyhj46bv0in8z4iwal6ipjjcm38qz1j4ric71l1kf";}
{name="libksane";value="0pqgh21ymq0pclbvq411aglclak6afqll5d0y8hz8m6afkmjhqxc";}
{name="lskat";value="04gvh3266hllfzl5syai3qw7zvkd7jipqdrwzynqvzpdg725a05g";}
{name="marble";value="0v4c1psyl5342f01n0794wk0ckg5chblibvap0vicanlq16pp65f";}
{name="mplayerthumbs";value="198b8f3s7zv4sprbj22flzdpxsag91p283iym5q9mkialf51789y";}
{name="nepomuk-core";value="15zzraacig4qqmwabw7xy38ddvcxam7djw96yhxc0z8zr3xffysj";}
{name="nepomuk-widgets";value="1kjzp7px5l7q9bal0dxpm24wq05s0wbjgqli6bhx7d5hipfr53w2";}
{name="okular";value="0zvmfh9ijwx10zy9nq6295x1w9x1xljkdcsz5269m230ff6wwmnh";}
{name="oxygen-icons";value="1z46zmazg1hf6yy2krfqpb5i5xmf7kpw9l7wvh3ihfqsdh77qmn8";}
{name="pairs";value="0i9wg6a3y71m3bdp5qjk6f9bmmd45r9hi7b8fqxp8srxcqn5hzx1";}
{name="palapeli";value="1cq8vggcc1358nf4n15pycmbn7m50lndd1w0541c85qirlnrq7wm";}
{name="parley";value="0cqdmjcsjqa8p42p7j8ni9mkf898p5hs3wdb757b4c1vyzkkdlpx";}
{name="perlkde";value="0w628fdxqmwv8k0x22307a4cpwlvq3lfsbhl5b3bv7naqjnwf549";}
{name="perlqt";value="11g5rh32i2x8klg5y5bapg581k4gm38jdfsmqsrjdcmxfw94bjil";}
{name="picmi";value="0y3s3k1x78z2asbcrcl8xkrk7kkz2ci4lbh1jfbnd66bx7lmwv0l";}
{name="print-manager";value="0x8lqjndi3ln90n8bgw26k09kz5ghkfm2xgqi4y0295ggbm3cm24";}
{name="pykde4";value="02qih6jw13mv9x4wf85ff9m5akdmxrz2jf2nlldyimh879dn0hxr";}
{name="qtruby";value="15wv6rh8d1f0d96f42bawyljlkpnamwxqng69jfd3q44j54gjkc5";}
{name="qyoto";value="1jpk5vp4ymvy8hhqia7b4mw0pzgdskb3aff30ik154mngzaqbdzc";}
{name="rocs";value="131gb6xfcrmwnl7nbxpm1rip9q2r8wzw8pb8f8a47vvswf200n7g";}
{name="smokegen";value="1vcc7yz6j7ndk8ppg7zr546cji6x5w38nlfc1lanq1pb3lbsddwn";}
{name="smokekde";value="1ib1xj6lkh2z80l9dci6w58f62f2mmpfz6hm81hygxqyxbf8rl64";}
{name="smokeqt";value="1fpv9c1qsl08p8s5a86ql0342hbalbh2inxv9a3risqg6qd0is6l";}
{name="step";value="1iayd98rqsl5qm1r4jiabnhw68691kakajgp9kpmn302ljn2wx5j";}
{name="superkaramba";value="1g86gacs1ss2sa3vdyg1ciwbpcd6d3i8yfb7fjmgvjm4qiyl3npg";}
{name="svgpart";value="0iy01cl4p37bfmr5779shbp202w25ik3phsqq6yjzfb7521xbm4r";}
{name="sweeper";value="1np09is041rb7bk8q1bhl0wmv3dypmsgyvd5yxg1qlsibn8mwbiw";}
];
modules=[
{
module="kdemultimedia";
split=true;
pkgs=[
{ name="audiocd-kio"; sane="audiocd_kio"; }
{ name="dragon"; }
{ name="ffmpegthumbs"; }
{ name="juk"; }
{ name="kmix"; }
{ name="kscd"; }
{ name="libkcddb"; }
{ name="libkcompactdisc"; }
{ name="mplayerthumbs"; }
];
}
{
module="kdegraphics";
split=true;
pkgs=[
{ name="gwenview"; }
{ name="kamera"; }
{ name="kcolorchooser"; }
{ name="kdegraphics-mobipocket"; sane="kdegraphics_mobipocket"; }
{ name="kdegraphics-strigi-analyzer"; sane="kdegraphics_strigi_analyzer"; }
{ name="kdegraphics-thumbnailers"; sane="kdegraphics_thumbnailers"; }
{ name="kgamma"; }
{ name="kolourpaint"; }
{ name="kruler"; }
{ name="ksaneplugin"; }
{ name="ksnapshot"; }
{ name="libkdcraw"; }
{ name="libkexiv2"; }
{ name="libkipi"; }
{ name="libksane"; }
{ name="okular"; }
{ name="svgpart"; }
];
}
{
module="kdelibs";
split=true;
pkgs=[
{ name="kdelibs"; }
{ name="nepomuk-core"; sane="nepomuk_core"; }
{ name="nepomuk-widgets"; sane="nepomuk_widgets"; }
];
}
{
module="kdeutils";
split=true;
pkgs=[
{ name="ark"; }
{ name="filelight"; }
{ name="kcalc"; }
{ name="kcharselect"; }
{ name="kdf"; }
{ name="kfloppy"; }
{ name="kgpg"; }
{ name="kremotecontrol"; }
{ name="ktimer"; }
{ name="kwallet"; }
{ name="print-manager"; sane="print_manager"; }
{ name="superkaramba"; }
{ name="sweeper"; }
];
}
{
module="applications";
split=true;
pkgs=[
{ name="kate"; }
{ name="konsole"; }
];
}
{
module="kdegames";
split=true;
pkgs=[
{ name="bomber"; }
{ name="bovo"; }
{ name="granatier"; }
{ name="kajongg"; }
{ name="kapman"; }
{ name="katomic"; }
{ name="kblackbox"; }
{ name="kblocks"; }
{ name="kbounce"; }
{ name="kbreakout"; }
{ name="kdiamond"; }
{ name="kfourinline"; }
{ name="kgoldrunner"; }
{ name="kigo"; }
{ name="killbots"; }
{ name="kiriki"; }
{ name="kjumpingcube"; }
{ name="klickety"; }
{ name="klines"; }
{ name="kmahjongg"; }
{ name="kmines"; }
{ name="knavalbattle"; }
{ name="knetwalk"; }
{ name="kolf"; }
{ name="kollision"; }
{ name="konquest"; }
{ name="kpat"; }
{ name="kreversi"; }
{ name="kshisen"; }
{ name="ksirk"; }
{ name="ksnakeduel"; }
{ name="kspaceduel"; }
{ name="ksquares"; }
{ name="ksudoku"; }
{ name="ktuberling"; }
{ name="kubrick"; }
{ name="libkdegames"; }
{ name="libkmahjongg"; }
{ name="lskat"; }
{ name="palapeli"; }
{ name="picmi"; }
];
}
{
module="kdeedu";
split=true;
pkgs=[
{ name="analitza"; }
{ name="blinken"; }
{ name="cantor"; }
{ name="kalgebra"; }
{ name="kalzium"; }
{ name="kanagram"; }
{ name="kbruch"; }
{ name="kgeography"; }
{ name="khangman"; }
{ name="kig"; }
{ name="kiten"; }
{ name="klettres"; }
{ name="kmplot"; }
{ name="kstars"; }
{ name="ktouch"; }
{ name="kturtle"; }
{ name="kwordquiz"; }
{ name="libkdeedu"; }
{ name="marble"; }
{ name="pairs"; }
{ name="parley"; }
{ name="rocs"; }
{ name="step"; }
];
}
{
module="kdebindings";
split=true;
pkgs=[
{ name="kimono"; }
{ name="korundum"; }
{ name="kross-interpreters"; sane="kross_interpreters"; }
{ name="perlkde"; }
{ name="perlqt"; }
{ name="pykde4"; }
{ name="qtruby"; }
{ name="qyoto"; }
{ name="smokegen"; }
{ name="smokekde"; }
{ name="smokeqt"; }
];
}
{
module="kdeaccessibility";
split=true;
pkgs=[
{ name="jovie"; }
{ name="kaccessible"; }
{ name="kmag"; }
{ name="kmousetool"; }
{ name="kmouth"; }
];
}
{
module="kde-baseapps";
sane="kde_baseapps"; split=true;
pkgs=[
{ name="kde-baseapps"; sane="kde_baseapps"; }
];
}
{ module="kactivities"; split=false;}
{ module="kdeadmin"; split=false;
pkgs=[
{ name="strigi-analyzer"; sane="strigi_analyzer";}
{ name="kuser"; }
{ name="kcron"; }
{ name="ksystemlog"; }
];
}
{ module="kdeartwork"; split=false;
pkgs=[
{ name="ColorSchemes"; }
{ name="IconThemes"; }
{ name="emoticons"; }
{ name="kscreensaver"; }
{ name="kwin-styles"; sane="kwin_styles";}
{ name="sounds"; }
{ name="styles"; }
{ name="wallpapers"; }
{ name="HighResolutionWallpapers"; }
{ name="WeatherWallpapers"; }
{ name="desktopthemes"; }
];
}
{ module="kde-base-artwork"; sane="kde_base_artwork"; split=false;}
{ module="kdenetwork"; split=false;
pkgs=[
{ name="kfile-plugins"; sane="kfile_plugins";}
{ name="kget"; }
{ name="kopete"; }
{ name="krdc"; }
{ name="kppp"; }
{ name="krfb"; }
{ name="kdnssd"; }
{ name="filesharing"; }
];
}
{ module="kdepim"; split=false;}
{ module="kdepimlibs"; split=false;}
{ module="kdepim-runtime"; sane="kdepim_runtime"; split=false;}
{ module="kdeplasma-addons"; sane="kdeplasma_addons"; split=false;}
{ module="kde-runtime"; sane="kde_runtime"; split=false;}
#had to add fake pkgs to kdesdk to get it to be treated like a split module
{ module="kdesdk"; split=false; pkgs = [{ name="fake"; }]; }
{ module="kdetoys"; split=false;
pkgs=[
{ name="kteatime"; }
{ name="ktux"; }
{ name="amor"; }
];
}
{ module="kde-wallpapers"; sane="kde_wallpapers"; split=false;}
{ module="kdewebdev"; split=false;
pkgs=[
{ name="klinkstatus"; }
{ name="kfilereplace"; }
{ name="kimagemapeditor"; }
{ name="kommander"; }
];
}
{ module="kde-workspace"; sane="kde_workspace"; split=false;}
{ module="oxygen-icons"; sane="oxygen_icons"; split=false;}
];
}

View File

@ -0,0 +1,127 @@
{ callPackage, runCommand, stdenv, fetchurl, qt4, cmake, automoc4
, release, ignoreList, extraSubpkgs
}:
let
inherit (stdenv.lib) filter fold;
inherit (builtins) getAttr hasAttr remoteAttrs listToAttrs tail head;
in
rec {
manifest = import (./. + "/${release}.nix");
# src attribute for $name tarball
kdesrc = name: fetchurl {
url = "mirror://kde/" + (if manifest.stable then "" else "un")
+ "stable/${release}/src/${name}-${release}.tar.xz";
sha256 = getAttr name manifest.hashes;
};
# Default meta attribute
defMeta = {
homepage = http://www.kde.org;
inherit (qt4.meta) platforms maintainers;
};
# KDE package built from the whole tarball
# This function is used both for monolithic modules and modules which are
# released as individual tarballs
kdeMonoPkg = name: let n_ = name; in a@{meta, name ? n_, ...}:
stdenv.mkDerivation ({
name = "${name}-${release}";
src = kdesrc name;
meta = defMeta // meta;
enableParallelBuilding = true;
} // (removeAttrs a [ "meta" "name" ]));
# kdeMonoPkg wrapper for modules splitted upstream compatible with combinePkgs
# API.
kdeSplittedPkg = module: {name, sane ? name}: kdeMonoPkg name;
# Build subdirectory ${subdir} of tarball ${module}-${release}.tar.xz
kdeSubdirPkg = module:
{name, subdir ? name, sane ? name}:
let name_ = name; in
a@{cmakeFlags ? [], name ? name_, meta ? {}, ...}:
stdenv.mkDerivation ({
name = "${name}-${release}";
src = kdesrc module;
cmakeFlags =
[ "-DDISABLE_ALL_OPTIONAL_SUBDIRECTORIES=TRUE"
"-DBUILD_doc=TRUE"
"-DBUILD_${subdir}=TRUE"
] ++ cmakeFlags;
meta = defMeta // meta;
enableParallelBuilding = module.enableParallelBuilding or true;
} // (removeAttrs a [ "meta" "name" "cmakeFlags" ]));
# A KDE monolithic module
kdeMonoModule = name: path: callPackage path { kde = kdeMonoPkg name; };
# Combine packages in one module.
# Arguments:
# * pkgFun --- a function of the following signature:
# module: manifest_attrs: manual_attrs: derivation;
# * module --- name of the module
# * pkgs --- list of packages in manifest format
combinePkgs = pkgFun: module: pkgs:
let
f = p@{name, ...}:
callPackage (./.. + "/${module}/${name}.nix") { kde = pkgFun module p; };
list = map f pkgs;
attrs = listToAttrs (map
({name, sane ? name, ...}@p: { name = sane; value = f p; })
pkgs);
in
runCommand "${module}-${release}"
({passthru = attrs // {
propagatedUserEnvPackages = list;
projects = attrs;
};})
''
mkdir -pv $out/nix-support
echo "${toString list}" | tee $out/nix-support/propagated-user-env-packages
'';
# Given manifest module data, return the module
kdeModule = { module, sane ? module, split, pkgs ? [] }:
let
pkgs_ = filterPkgs module pkgs;
in
# Module is splitted by upstream
if split then combinePkgs kdeSplittedPkg module pkgs_
# Monolithic module
else if pkgs == [] then kdeMonoModule module (./.. + "/${module}.nix")
# Module is splitted by us
else combinePkgs kdeSubdirPkg module pkgs_;
# The same, as nameValuePair with sane name
kdeModuleNV = a@{ module, sane ? module, ... }:
{ name = sane; value = kdeModule a; };
filterPkgs = module: (p:
removeNames (stdenv.lib.attrByPath [module] [] ignoreList) p
++ (stdenv.lib.attrByPath [module] [] extraSubpkgs));
# Remove attrsets with x.name in subst. Optimized for empty subst.
removeNames = subst: big:
fold (s: out: filter (x: x.name != s) out) big subst;
modules = listToAttrs (map kdeModuleNV manifest.modules);
splittedModuleList =
let
splitted = filter (a: a ? pkgs) manifest.modules;
names = map ({module, sane ? module, ...}: sane) splitted;
in
map (m: m.projects) (stdenv.lib.attrVals names modules);
individual =
stdenv.lib.zipAttrsWith
(
name: list:
if tail list == []
then head list
else abort "Multiple modules define ${name}"
)
splittedModuleList;
}

View File

@ -0,0 +1,146 @@
#! /bin/sh
# Usage: download kde release to $dir, then run
# $0 $dir
dir="$1"
# Detect release number & whether it is a stable release
if [[ ! -d "${dir}" ]]; then
echo "${dir} is not a directory (or doesn't exist)!" >&2
exit 1
fi
release=$(ls "${dir}"/kdelibs-*.tar.xz | \
sed -e 's/.*kdelibs-//' -e 's/\.tar\.xz//')
if [[ ${release##*.} -gt 50 ]]; then
stable="false"
else
stable="true"
fi
echo "Detected release ${release}" >&2
declare -A hash
declare -A modules
declare -a packages
declare -a top_level
# xsltproc output declares -A module
if [[ ! -f kde_projects.xml ]]; then
curl -O -J http://projects.kde.org/kde_projects.xml
fi
eval `xsltproc kde-submodules.xslt kde_projects.xml`
module[kde-baseapps]=kde-baseapps
unset module[kactivities]
print_sane() {
echo "Called print_sane $1" >&2
sane="${1//[^a-z0-9_]/_}"
if [[ "$sane" != "$1" ]]; then
echo "Sane version is $sane" >&2
echo -n "sane=\"$sane\";"
fi
}
for i in `cd "${dir}"; ls *-${release}.tar.xz`; do
package=${i%-${release}.tar.xz}
packages+=( "$package" )
echo -n "${package}.. " >&2
hash[$package]=$(nix-hash --type sha256 --flat --base32 "${dir}/${i}")
echo -n ${hash[$package]} >&2
if [ -n "${module[$package]}" ]; then
m="${module[$package]}"
echo " (${m})" >&2
modules[$m]=1
else
top_level+=( "$package" )
echo " (top-level)" >&2
fi
#nix-store --add-fixed sha256 "${dir}/${i}" >&2
done
print_pkg_hash() {
echo " {name=\"${1}\";value=\"${hash[$1]}\";}"
}
print_hashes(){
echo "hashes=builtins.listToAttrs["
for p in "${packages[@]}"; do print_pkg_hash "$p"; done
echo "];"
}
print_split_module(){
echo -n "$1:" >&2
echo -e "{\n module=\"$1\";"
print_sane "$1"
echo " split=true;"
echo " pkgs=["
for p in "${packages[@]}"; do
if [[ "${module[$p]}" == "$1" ]]; then
echo -n " { name=\"$p\"; "
print_sane "$p"
echo " }"
echo -n " $p" >&2
fi
done
echo " ];"
echo "}"
echo >&2
}
print_mono_module(){
echo -en "{ module=\"$1\"; "
print_sane "$1"
echo -n "$1 ... " >&2
echo -n " split=false;"
cml="$1-$release/CMakeLists.txt"
tar -xf "${dir}/$1-${release}.tar.xz" "$cml"
if grep '^[^#]*add_subdirectory' $cml >/dev/null; then
if grep '^[^#]*add_subdirectory' $cml | grep -v macro_optional_add_subdirectory >/dev/null; then
echo " is monolithic (has unconditionally added subdirs)" >&2
else
subdirs=( `grep '^[^#]*add_subdirectory' $cml |
sed -e 's/[^#]*add_subdirectory *( *\(.*\) *)/\1/' |
grep -v '\(doc\|cmake\)'` )
echo " seems splittable, subdirs: ${subdirs[*]}" >&2
echo -e "\n pkgs=["
for s in "${subdirs[@]}"; do
echo -en " {"
echo -n " name=\"${s//\//-}\"; "
print_sane "$s"
if [[ $s != "${s//\//-}" ]]; then
echo -n "subdir=\"$s\"; "
fi
echo "}"
done
echo -e " ];\n"
fi
else
echo " is monolithic (has no subdirs)" >&2
fi
rm $cml
rmdir $1-$release
echo "}"
}
print_modules(){
echo "modules=["
echo "Printing modules splitted by upstream" >&2
for m in "${!modules[@]}"; do print_split_module "$m"; done
echo >&2
echo "Printing modules not splitted by upstream (${top_level[*]})" >&2
for m in "${top_level[@]}"; do print_mono_module "$m"; done
echo "];"
}
echo "Writing ${release}.nix" >&2
exec > "${release}.nix"
echo "{stable=${stable};"
print_hashes
print_modules
echo "}"

View File

@ -0,0 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- xslt file for http://projects.kde.org/kde_projects.xml -->
<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
<xsl:output method="text" />
<xsl:template match="/">
<xsl:for-each select="kdeprojects/component[@identifier='kde']">
<xsl:text>declare -A module </xsl:text>
<xsl:for-each select="module">
<xsl:variable name="module" select='@identifier' />
<xsl:for-each select=".//project[repo]">
<xsl:text>module["</xsl:text>
<xsl:value-of select='@identifier' />
<xsl:text>"]="</xsl:text>
<xsl:value-of select="$module" />
<xsl:text>" </xsl:text>
</xsl:for-each>
</xsl:for-each>
</xsl:for-each>
</xsl:template>
</xsl:stylesheet>

View File

@ -0,0 +1,21 @@
{ kde, kdelibs, shared_desktop_ontologies, bzip2, libssh, exiv2, attica
, libcanberra, virtuoso, samba, libjpeg, ntrack, pkgconfig, qca2, xz, pulseaudio
, networkmanager, nepomuk_core, kactivities, kdepimlibs
}:
kde {
buildInputs = [
kdelibs attica xz bzip2 nepomuk_core libssh libjpeg exiv2 ntrack
qca2 samba (libcanberra.override { gtk = null; }) pulseaudio
networkmanager kactivities kdepimlibs
#todo: add openslp, openexr
];
nativeBuildInputs = [ pkgconfig ];
passthru.propagatedUserEnvPackages = [ virtuoso ];
meta = {
license = "LGPL";
};
}

View File

@ -0,0 +1,17 @@
{ kde, cmake }:
kde {
nativeBuildInputs = [ cmake ];
patches = [ ./files/kde-wallpapers-buildsystem.patch ];
cmakeFlags = "-DWALLPAPER_INSTALL_DIR=share/wallpapers";
outputHashAlgo = "sha256";
outputHashMode = "recursive";
outputHash = "1qpnv4f8f2aga3i1w9k0f0s6myilnm0f9mja8ikkkgi2qpv1q66f";
meta = {
description = "Wallpapers for KDE";
};
}

View File

@ -0,0 +1,38 @@
{ kde, kdelibs, qimageblitz, libdbusmenu_qt, xorg, shared_desktop_ontologies,
lm_sensors, pciutils, libraw1394, libusb, libxklavier, python, libqalculate,
xkeyboard_config, kdepimlibs, pam, boost, gpsd, prison, akonadi,
libjpeg, pkgconfig, libXft, libXxf86misc, kactivities, qjson, networkmanager
}:
kde {
#todo: googlegadgets, consolekit, xmms
buildInputs =
[ kdelibs qimageblitz libdbusmenu_qt libjpeg xorg.libxcb xorg.xcbutilimage
xorg.xcbutilrenderutil libXft #libXxf86misc
xorg.libxkbfile xorg.libXcomposite xorg.libXtst #xorg.libXScrnSaver
xorg.libXdamage xorg.libXau xorg.libXdmcp xorg.libpthreadstubs
boost gpsd lm_sensors pciutils libraw1394
libusb python libqalculate kdepimlibs pam prison akonadi qjson networkmanager
kactivities
];
nativeBuildInputs = [ pkgconfig ];
preConfigure =
''
# Fix incorrect path to kde4-config.
substituteInPlace startkde.cmake --replace '$bindir/kde4-config' ${kdelibs}/bin/kde4-config
# Fix the path to the keyboard configuration files.
substituteInPlace kcontrol/keyboard/xkb_rules.cpp \
--replace /usr/share/X11 ${xkeyboard_config}/etc/X11
'';
enableParallelBuilding = false; # frequent problems on Hydra
meta = {
description = "KDE workspace components such as Plasma, Kwin and System Settings";
license = "GPLv2";
};
}

View File

@ -0,0 +1,9 @@
{ kde, kdelibs, speechd }:
kde {
buildInputs = [ kdelibs speechd ];
meta = {
description = "Text-to-speech synthesis daemon";
};
}

View File

@ -0,0 +1,9 @@
{ kde, kdelibs, speechd }:
kde {
buildInputs = [ kdelibs speechd ];
meta = {
description = "Bridge that provides accessibility services to applications";
};
}

View File

@ -0,0 +1,10 @@
{ kde, kdelibs }:
kde {
#todo: package qaccessibilityclient
buildInputs = [ kdelibs ];
meta = {
description = "Screen magnifier for KDE";
};
}

View File

@ -0,0 +1,9 @@
{ kde, kdelibs, libXtst, libXt }:
kde {
buildInputs = [ kdelibs libXtst libXt ];
meta = {
description = "A program that clicks the mouse for you";
};
}

View File

@ -0,0 +1,9 @@
{ kde, kdelibs }:
kde {
buildInputs = [ kdelibs ];
meta = {
description = "A type-and-say front end for speech synthesizers";
};
}

View File

@ -0,0 +1,5 @@
{ kde, kdelibs }:
kde {
buildInputs = [ kdelibs ];
}

View File

@ -0,0 +1,5 @@
{ kde, kdelibs }:
kde {
buildInputs = [ kdelibs ];
}

View File

@ -0,0 +1,5 @@
{ kde, kdelibs, kdepimlibs, nepomuk_core }:
kde {
buildInputs = [ kdelibs kdepimlibs nepomuk_core];
}

View File

@ -0,0 +1,11 @@
{ kde, kdelibs }:
kde {
name = "kde-color-schemes";
buildInputs = [ kdelibs ];
meta = {
description = "Additional KDE color schemes";
};
}

View File

@ -0,0 +1,73 @@
#Macro to find xscreensaver directory
# Copyright (c) 2006, Laurent Montel, <montel@kde.org>
#
# Redistribution and use is allowed according to the terms of the BSD license.
# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
if (NOT XSCREENSAVER_FOUND)
FIND_PATH(XSCREENSAVER_DIR deco
HINTS
${KDE4_INCLUDE_DIR}
PATHS
/usr
/usr/local
/opt/local
/usr/X11R6
/opt/kde
/opt/kde3
/usr/kde
/usr/local/kde
/usr/local/xscreensaver
/usr/openwin/lib/xscreensaver
/etc
PATH_SUFFIXES
lib${LIB_SUFFIX}/xscreensaver
lib${LIB_SUFFIX}/misc/xscreensaver
lib/xscreensaver
lib64/xscreensaver
lib/misc/xscreensaver
libexec/xscreensaver
bin/xscreensaver-hacks
hacks)
message(STATUS "XSCREENSAVER_DIR <${XSCREENSAVER_DIR}>")
FIND_PATH(XSCREENSAVER_CONFIG_DIR deco.xml
PATHS
${KDE4_INCLUDE_DIR}
/usr/
/usr/local/
/opt/local/
/usr/X11R6/
/opt/kde/
/opt/kde3/
/usr/kde/
/usr/local/kde/
/usr/openwin/lib/xscreensaver/
/etc/
PATH_SUFFIXES xscreensaver xscreensaver/config share/xscreensaver/config
)
MESSAGE(STATUS "XSCREENSAVER_CONFIG_DIR :<${XSCREENSAVER_CONFIG_DIR}>")
endif(NOT XSCREENSAVER_FOUND)
#MESSAGE(STATUS "XSCREENSAVER_CONFIG_DIR :<${XSCREENSAVER_CONFIG_DIR}>")
#MESSAGE(STATUS "XSCREENSAVER_DIR :<${XSCREENSAVER_DIR}>")
# Need to fix hack
if(XSCREENSAVER_DIR AND XSCREENSAVER_CONFIG_DIR)
set(XSCREENSAVER_FOUND TRUE)
endif(XSCREENSAVER_DIR AND XSCREENSAVER_CONFIG_DIR)
if (XSCREENSAVER_FOUND)
if (NOT Xscreensaver_FIND_QUIETLY)
message(STATUS "Found XSCREENSAVER_CONFIG_DIR <${XSCREENSAVER_CONFIG_DIR}>")
endif (NOT Xscreensaver_FIND_QUIETLY)
else (XSCREENSAVER_FOUND)
if (Xscreensaver_FIND_REQUIRED)
message(FATAL_ERROR "XScreenSaver not found")
endif (Xscreensaver_FIND_REQUIRED)
endif (XSCREENSAVER_FOUND)
MARK_AS_ADVANCED(XSCREENSAVER_DIR XSCREENSAVER_CONFIG_DIR)

View File

@ -0,0 +1,11 @@
{ kde, kdelibs }:
kde rec {
name = "kde-wallpapers-high-resolution";
buildInputs = [ kdelibs ];
meta = {
description = "KDE wallpapers in high resolution";
};
}

View File

@ -0,0 +1,13 @@
{ kde, kdelibs }:
kde {
name = "kdeartwork-icon-themes";
# Sources contain primary and kdeclassic as well but they're not installed
buildInputs = [ kdelibs ];
meta = {
description = "KDE nuvola and mono icon themes";
};
}

View File

@ -0,0 +1,11 @@
{ kde, kdelibs }:
kde rec {
name = "kde-weather-wallpapers";
buildInputs = [ kdelibs ];
meta = {
description = "Additional KDE wallpapers (weather)";
};
}

View File

@ -0,0 +1,11 @@
{ kde, kdelibs }:
kde {
name = "kde-desktop-themes";
buildInputs = [ kdelibs ];
meta = {
description = "Additional KDE desktop themes";
};
}

View File

@ -0,0 +1,11 @@
{ kde, kdelibs }:
kde {
name = "kde-emotion-icons";
buildInputs = [ kdelibs ];
meta = {
description = "Additional KDE emotion icons (smiles)";
};
}

View File

@ -0,0 +1,15 @@
{ kde, kdelibs, xscreensaver, kde_workspace, eigen, libkexiv2, libXt, pkgconfig }:
kde {
buildInputs = [ kdelibs xscreensaver kde_workspace eigen libkexiv2 libXt ];
nativeBuildInputs = [ pkgconfig ];
preConfigure = "cp -v ${./FindXscreensaver.cmake} cmake/modules/FindXscreensaver.cmake";
cmakeFlags = [ "-DBUILD_asciiquarium:BOOL=ON" ];
meta = {
description = "KDE screensavers";
};
}

View File

@ -0,0 +1,9 @@
{ kde, kdelibs, kde_workspace }:
kde {
buildInputs = [ kdelibs kde_workspace ];
meta = {
description = "Styles for KWin";
};
}

View File

@ -0,0 +1,11 @@
{ kde, kdelibs }:
kde rec {
name = "kde-sounds";
buildInputs = [ kdelibs ];
meta = {
description = "New login/logout sounds";
};
}

View File

@ -0,0 +1,11 @@
{ kde, kdelibs }:
kde rec {
name = "kde-style-phase";
buildInputs = [ kdelibs ];
meta = {
description = "Phase, a widget style for KDE";
};
}

View File

@ -0,0 +1,11 @@
{ kde, kdelibs }:
kde rec {
name = "kde-wallpapers";
buildInputs = [ kdelibs ];
meta = {
description = "Additional KDE wallpapers";
};
}

View File

@ -0,0 +1,19 @@
commit 48b92b74bc6fd270c33a726257e2879203cf5064
Author: Yury G. Kudryashov [diff odt] <urkud.urkud@gmail.com>
Date: Wed Mar 21 00:47:43 2012 +0400
Include SMOKE_QTCORE_INCLUDE_DIR
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 48020a1..2263a73 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,7 +14,7 @@ find_package(Smoke COMPONENTS QtCore QtGui QtNetwork Qt3Support QtDeclarative Qt
QtOpenGl QtScript QtSql QtSvg QtTest QtUiTools QtWebKit QtXml QtXmlPatterns
Phonon Qwt QSci QImageBlitz)
-include_directories(${SMOKE_INCLUDE_DIR} ${QT_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR}/src)
+include_directories(${SMOKE_INCLUDE_DIR} ${SMOKE_QTCORE_INCLUDE_DIR} ${QT_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR}/src)
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake ${SMOKE_CMAKE_MODULE_DIR})
include(MacroOptionalFindPackage)
include(MacroOptionalAddBindings)

View File

@ -0,0 +1,118 @@
commit e702abfd16f610e773fb0310d8c6512991794c63
Author: Yury G. Kudryashov [diff odt] <urkud.urkud@gmail.com>
Date: Wed Mar 21 00:50:02 2012 +0400
Rewrite FindPerlMore.cmake
* Ask perl for expanded paths
* Move execute_process to a macro
* Add PERL_*_INSTALL_DIR variables that point to CMAKE_INSTALL_PREFIX
The last change makes it easy to install a file into CMAKE_INSTALL_PREFIX
instead of perl install prefix.Add debug message
diff --git a/cmake/FindPerlMore.cmake b/cmake/FindPerlMore.cmake
index 6412a47..cc8faf8 100644
--- a/cmake/FindPerlMore.cmake
+++ b/cmake/FindPerlMore.cmake
@@ -5,54 +5,52 @@
#
# PERL_INCLUDE_PATH = path to where perl.h can be found
-if(PERL_INCLUDE_PATH)
- # Already in cache, be silent
- SET(PERL_HEADERS_FOUND TRUE)
-endif (PERL_INCLUDE_PATH)
-
-IF(PERL_EXECUTABLE)
- EXECUTE_PROCESS(COMMAND ${PERL_EXECUTABLE} -MConfig -e "print \$Config{archlib}"
- OUTPUT_VARIABLE PERL_ARCH_LIB_DIR)
-
- EXECUTE_PROCESS(COMMAND ${PERL_EXECUTABLE} -MConfig -e "print \$Config{sitearch}"
- OUTPUT_VARIABLE PERL_SITE_ARCH_DIR)
-
- EXECUTE_PROCESS(COMMAND ${PERL_EXECUTABLE} -MConfig -e "print \$Config{vendorarch}"
- OUTPUT_VARIABLE PERL_VENDOR_ARCH_DIR)
-
- EXECUTE_PROCESS(COMMAND ${PERL_EXECUTABLE} -MConfig -e "print \$Config{sitelib}"
- OUTPUT_VARIABLE PERL_SITE_LIB_DIR)
-
- EXECUTE_PROCESS(COMMAND ${PERL_EXECUTABLE} -MConfig -e "print \$Config{vendorlib}"
- OUTPUT_VARIABLE PERL_VENDOR_LIB_DIR)
-
- EXECUTE_PROCESS(COMMAND ${PERL_EXECUTABLE} -MConfig -e "print \$Config{version}"
- OUTPUT_VARIABLE PERL_VERSION)
-
- EXECUTE_PROCESS(COMMAND ${PERL_EXECUTABLE} -MConfig -e "print \$Config{ccflags}"
- OUTPUT_VARIABLE PERL_CXX_FLAGS)
-
- EXECUTE_PROCESS(COMMAND ${PERL_EXECUTABLE} -MConfig -e "print \$Config{ccdlflags}"
- OUTPUT_VARIABLE PERL_CCDL_FLAGS)
-
- EXECUTE_PROCESS(COMMAND ${PERL_EXECUTABLE} -MConfig -MFile::Spec -e "print '-L' . File::Spec->catdir(\$Config{archlibexp}, 'CORE')"
- OUTPUT_VARIABLE PERL_EXTRA_LIB_PATHS)
-
- EXECUTE_PROCESS(COMMAND ${PERL_EXECUTABLE} -MConfig -e "print \$Config{perllibs}"
- OUTPUT_VARIABLE PERL_LIBS)
-
- FIND_PATH(PERL_INCLUDE_PATH
- NAMES perl.h
- PATHS ${PERL_ARCH_LIB_DIR}/CORE
- )
-
- if(PERL_INCLUDE_PATH)
- SET(PERL_HEADERS_FOUND TRUE)
- endif (PERL_INCLUDE_PATH)
-
- MARK_AS_ADVANCED(
- PERL_INCLUDE_PATH
- )
+if(FIND_PERLMORE_REQUIRED)
+ find_package(Perl REQUIRED)
+else()
+ find_package(Perl)
+endif()
+
+macro(_perl_get_config_var name output)
+ execute_process(COMMAND ${PERL_EXECUTABLE} -MConfig -e "print \$Config{${name}}"
+ OUTPUT_VARIABLE PERL_${output})
+endmacro()
+
+macro(_perl_get_config_dir name)
+ string(TOLOWER ${name} _tmp)
+ string(REPLACE "_" "" _tmp ${_tmp})
+ _perl_get_config_var(${_tmp}exp ${name}_DIR)
+ string(REPLACE "${PERL_ROOT_DIR}" "${CMAKE_INSTALL_PREFIX}" PERL_${name}_INSTALL_DIR "${PERL_${name}_DIR}")
+endmacro()
+
+if(PERL_EXECUTABLE)
+ _perl_get_config_var(prefixexp ROOT_DIR)
+
+ _perl_get_config_dir(ARCH_LIB)
+ _perl_get_config_dir(SITE_ARCH)
+ _perl_get_config_dir(VENDOR_ARCH)
+ _perl_get_config_dir(SITE_LIB)
+ _perl_get_config_dir(VENDOR_LIB)
+
+ _perl_get_config_var(version VERSION)
+ _perl_get_config_var(ccflags CXX_FLAGS)
+ _perl_get_config_var(ccdlflags CCDL_FLAGS)
+
+ EXECUTE_PROCESS(COMMAND ${PERL_EXECUTABLE} -MConfig -MFile::Spec -e "print '-L' . File::Spec->catdir(\$Config{archlibexp}, 'CORE')"
+ OUTPUT_VARIABLE PERL_EXTRA_LIB_PATHS)
+
+ _perl_get_config_var(perllibs LIBS)
+
+ FIND_PATH(PERL_INCLUDE_PATH
+ NAMES perl.h
+ HINTS ${PERL_ARCH_LIB_DIR}/CORE
+ )
+
+ if(PERL_INCLUDE_PATH)
+ SET(PERL_HEADERS_FOUND TRUE)
+ endif (PERL_INCLUDE_PATH)
+
+ MARK_AS_ADVANCED(PERL_INCLUDE_PATH)
ENDIF(PERL_EXECUTABLE)
IF(PERL_HEADERS_FOUND)

View File

@ -0,0 +1,454 @@
commit c78779fcaff587818ee37bec3ded5e0617625b95
Author: Yury G. Kudryashov [diff odt] <urkud.urkud@gmail.com>
Date: Wed Mar 21 01:01:27 2012 +0400
Install to PERL_SITE_ARCH_INSTALL_DIR
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 48020a1..16188df 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -36,7 +36,6 @@ macro_log_feature(Qwt5_Qt4_FOUND "Qwt5 for Qt4" "Qwt5 libraries for Qt4" "http:/
add_definitions(-DDEBUG)
include (FindPerlMore)
-set(CUSTOM_PERL_SITE_ARCH_DIR ${PERL_SITE_ARCH_DIR} CACHE DIR "Custom installation directory for perl binary extension")
# the RPATH to be used when installing, but only if it's not a system directory
GET_FILENAME_COMPONENT(SMOKE_LIB_DIR ${SMOKE_BASE_LIBRARY} PATH)
diff --git a/INSTALL b/INSTALL
index d19f97e..97cc9f1 100644
--- a/INSTALL
+++ b/INSTALL
@@ -36,7 +36,6 @@ ccmake step.
The standard options are:
CMAKE_BUILD_TYPE = The type of build ('Debug', 'Release', etc)
CMAKE_INSTALL_PREFIX = The location for any executables ( e.g. puic4 )
- CUSTOM_PERL_SITE_ARCH_DIR = The location for the perl modules themselves.
QT_QMAKE_EXECUTABLE = The path to your system's qmake.
cmake looks in your path for a qmake executable. If it can't find it, it will
diff --git a/Makefile.PL b/Makefile.PL
index df9a13c..31dd912 100755
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -3,7 +3,7 @@
use strict;
use Config;
-my ($prefix, $sitearch, $qmake) = ($Config{prefix}, $Config{sitearch});
+my ($prefix, $qmake) = ($Config{prefix});
my @cmakeArgs;
foreach my $arg (@ARGV) {
my $key = $arg;
@@ -12,7 +12,6 @@ foreach my $arg (@ARGV) {
$value =~ s/^[^=]*=//g;
if ($key eq 'PREFIX' or $key eq 'INSTALL_BASE') {
$prefix = $value;
- $sitearch = "$prefix";
}
elsif ($key eq 'QMAKE') {
$qmake = $value;
@@ -34,7 +33,6 @@ if($^O =~ /win/i){
}
push @args, "-DCMAKE_INSTALL_PREFIX=$prefix" if $prefix;
push @args, "-DQT_QMAKE_EXECUTABLE=$qmake" if $qmake;
-push @args, "-DCUSTOM_PERL_SITE_ARCH_DIR=$sitearch" if $sitearch;
push @args, @cmakeArgs;
if ( eval "require Alien::SmokeQt" ) {
diff --git a/phonon/lib/CMakeLists.txt b/phonon/lib/CMakeLists.txt
index f2857c3..78674ea 100644
--- a/phonon/lib/CMakeLists.txt
+++ b/phonon/lib/CMakeLists.txt
@@ -1,2 +1,2 @@
add_custom_target(phononpm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/Phonon.pm ${CMAKE_BINARY_DIR}/blib/lib/Phonon.pm)
-install(FILES Phonon.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/)
+install(FILES Phonon.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/)
diff --git a/phonon/src/CMakeLists.txt b/phonon/src/CMakeLists.txt
index a04db11..9933dfd 100644
--- a/phonon/src/CMakeLists.txt
+++ b/phonon/src/CMakeLists.txt
@@ -37,4 +37,4 @@ target_link_libraries(perl_phonon
set_target_properties(perl_phonon PROPERTIES OUTPUT_NAME ${libraryName})
set_target_properties(perl_phonon PROPERTIES PREFIX "")
-install(TARGETS perl_phonon DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/)
+install(TARGETS perl_phonon DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/)
diff --git a/qimageblitz/lib/CMakeLists.txt b/qimageblitz/lib/CMakeLists.txt
index 0809ba8..22fc1c0 100644
--- a/qimageblitz/lib/CMakeLists.txt
+++ b/qimageblitz/lib/CMakeLists.txt
@@ -1,2 +1,2 @@
add_custom_target(qimageblitzpm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/QImageBlitz.pm ${CMAKE_BINARY_DIR}/blib/lib/QImageBlitz.pm)
-install(FILES QImageBlitz.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/)
+install(FILES QImageBlitz.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/)
diff --git a/qimageblitz/src/CMakeLists.txt b/qimageblitz/src/CMakeLists.txt
index 02ef494..4f02c1b 100644
--- a/qimageblitz/src/CMakeLists.txt
+++ b/qimageblitz/src/CMakeLists.txt
@@ -37,4 +37,4 @@ target_link_libraries(perl_qimageblitz
set_target_properties(perl_qimageblitz PROPERTIES OUTPUT_NAME ${libraryName})
set_target_properties(perl_qimageblitz PROPERTIES PREFIX "")
-install(TARGETS perl_qimageblitz DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/)
+install(TARGETS perl_qimageblitz DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/)
diff --git a/qsci/lib/CMakeLists.txt b/qsci/lib/CMakeLists.txt
index 63b451f..d22869f 100644
--- a/qsci/lib/CMakeLists.txt
+++ b/qsci/lib/CMakeLists.txt
@@ -1,2 +1,2 @@
add_custom_target(qscipm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/Qsci.pm ${CMAKE_BINARY_DIR}/blib/lib/Qsci.pm)
-install(FILES Qsci.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/)
+install(FILES Qsci.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/)
diff --git a/qsci/src/CMakeLists.txt b/qsci/src/CMakeLists.txt
index 8c1659b..bdcb5a8 100644
--- a/qsci/src/CMakeLists.txt
+++ b/qsci/src/CMakeLists.txt
@@ -37,4 +37,4 @@ target_link_libraries(perl_qsci
set_target_properties(perl_qsci PROPERTIES OUTPUT_NAME ${libraryName})
set_target_properties(perl_qsci PROPERTIES PREFIX "")
-install(TARGETS perl_qsci DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/)
+install(TARGETS perl_qsci DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/)
diff --git a/qt3support/lib/CMakeLists.txt b/qt3support/lib/CMakeLists.txt
index 2f04cfa..dda5afa 100644
--- a/qt3support/lib/CMakeLists.txt
+++ b/qt3support/lib/CMakeLists.txt
@@ -1,2 +1,2 @@
add_custom_target(qt3support4pm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/Qt3Support4.pm ${CMAKE_BINARY_DIR}/blib/lib/Qt3Support4.pm)
-install(FILES Qt3Support4.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/)
+install(FILES Qt3Support4.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/)
diff --git a/qt3support/src/CMakeLists.txt b/qt3support/src/CMakeLists.txt
index b24532e..bed99aa 100644
--- a/qt3support/src/CMakeLists.txt
+++ b/qt3support/src/CMakeLists.txt
@@ -37,4 +37,4 @@ target_link_libraries(perl_qt3support4
set_target_properties(perl_qt3support4 PROPERTIES OUTPUT_NAME ${libraryName})
set_target_properties(perl_qt3support4 PROPERTIES PREFIX "")
-install(TARGETS perl_qt3support4 DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/)
+install(TARGETS perl_qt3support4 DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/)
diff --git a/qtcore/lib/CMakeLists.txt b/qtcore/lib/CMakeLists.txt
index ef07d10..1d78196 100644
--- a/qtcore/lib/CMakeLists.txt
+++ b/qtcore/lib/CMakeLists.txt
@@ -1,3 +1,3 @@
add_subdirectory( QtCore4 )
add_custom_target(perlqtcore4pm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/QtCore4.pm ${CMAKE_BINARY_DIR}/blib/lib/QtCore4.pm)
-install( FILES QtCore4.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR} )
+install( FILES QtCore4.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR} )
diff --git a/qtcore/lib/QtCore4/CMakeLists.txt b/qtcore/lib/QtCore4/CMakeLists.txt
index 44c7893..06aef20 100644
--- a/qtcore/lib/QtCore4/CMakeLists.txt
+++ b/qtcore/lib/QtCore4/CMakeLists.txt
@@ -1,3 +1,3 @@
-install( FILES signals.pm slots.pm isa.pm debug.pm classinfo.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/QtCore4 )
+install( FILES signals.pm slots.pm isa.pm debug.pm classinfo.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/QtCore4 )
add_custom_target(perlqt4pmlibmkdir ALL ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_DIR}/blib/lib/QtCore4)
add_custom_target(perlqt4pmlibsubdir ALL ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_BINARY_DIR}/blib/lib/QtCore4)
diff --git a/qtcore/src/CMakeLists.txt b/qtcore/src/CMakeLists.txt
index 3910636..b5e645c 100644
--- a/qtcore/src/CMakeLists.txt
+++ b/qtcore/src/CMakeLists.txt
@@ -53,10 +53,10 @@ target_link_libraries(perlqtcore4
set_target_properties(perlqtcore4 PROPERTIES
OUTPUT_NAME ${libraryName}
PREFIX ""
- INSTALL_NAME_DIR ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/
+ INSTALL_NAME_DIR ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/
)
-install(TARGETS perlqtcore4 EXPORT PerlQtExport DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/)
+install(TARGETS perlqtcore4 EXPORT PerlQtExport DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/)
install(FILES binding.h handlers.h listclass_macros.h marshall_basetypes.h marshall_complex.h
marshall.h marshall_macros.h marshall_primitives.h marshall_types.h perlqt.h ppport.h
QtCore4.h smokehelp.h smokeperl.h util.h
diff --git a/qtdbus/lib/CMakeLists.txt b/qtdbus/lib/CMakeLists.txt
index d03a672..a60d603 100644
--- a/qtdbus/lib/CMakeLists.txt
+++ b/qtdbus/lib/CMakeLists.txt
@@ -1,2 +1,2 @@
add_custom_target(qtdbus4pm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/QtDBus4.pm ${CMAKE_BINARY_DIR}/blib/lib/QtDBus4.pm)
-install(FILES QtDBus4.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/)
+install(FILES QtDBus4.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/)
diff --git a/qtdbus/src/CMakeLists.txt b/qtdbus/src/CMakeLists.txt
index 9aa05a0..5786ea2 100644
--- a/qtdbus/src/CMakeLists.txt
+++ b/qtdbus/src/CMakeLists.txt
@@ -31,4 +31,4 @@ target_link_libraries(perl_qtdbus4
set_target_properties(perl_qtdbus4 PROPERTIES OUTPUT_NAME "QtDBus4")
set_target_properties(perl_qtdbus4 PROPERTIES PREFIX "")
-install(TARGETS perl_qtdbus4 DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/QtDBus4/)
+install(TARGETS perl_qtdbus4 DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/QtDBus4/)
diff --git a/qtdeclarative/lib/CMakeLists.txt b/qtdeclarative/lib/CMakeLists.txt
index e8d2847..b458858 100644
--- a/qtdeclarative/lib/CMakeLists.txt
+++ b/qtdeclarative/lib/CMakeLists.txt
@@ -1,2 +1,2 @@
add_custom_target(qtdeclarative4pm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/QtDeclarative4.pm ${CMAKE_BINARY_DIR}/blib/lib/QtDeclarative4.pm)
-install(FILES QtDeclarative4.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/)
+install(FILES QtDeclarative4.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/)
diff --git a/qtdeclarative/src/CMakeLists.txt b/qtdeclarative/src/CMakeLists.txt
index 1662167..ec2a8fc 100644
--- a/qtdeclarative/src/CMakeLists.txt
+++ b/qtdeclarative/src/CMakeLists.txt
@@ -37,4 +37,4 @@ target_link_libraries(perl_qtdeclarative4
set_target_properties(perl_qtdeclarative4 PROPERTIES OUTPUT_NAME ${libraryName})
set_target_properties(perl_qtdeclarative4 PROPERTIES PREFIX "")
-install(TARGETS perl_qtdeclarative4 DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/)
+install(TARGETS perl_qtdeclarative4 DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/)
diff --git a/qtgui/lib/CMakeLists.txt b/qtgui/lib/CMakeLists.txt
index 82626c8..e62a4ac 100644
--- a/qtgui/lib/CMakeLists.txt
+++ b/qtgui/lib/CMakeLists.txt
@@ -1,2 +1,2 @@
add_custom_target(qtgui4pm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/QtGui4.pm ${CMAKE_BINARY_DIR}/blib/lib/QtGui4.pm)
-install(FILES QtGui4.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/)
+install(FILES QtGui4.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/)
diff --git a/qtgui/src/CMakeLists.txt b/qtgui/src/CMakeLists.txt
index 4cc8b36..44041b6 100644
--- a/qtgui/src/CMakeLists.txt
+++ b/qtgui/src/CMakeLists.txt
@@ -38,4 +38,4 @@ target_link_libraries(perl_qtgui4
set_target_properties(perl_qtgui4 PROPERTIES OUTPUT_NAME ${libraryName})
set_target_properties(perl_qtgui4 PROPERTIES PREFIX "")
-install(TARGETS perl_qtgui4 DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/)
+install(TARGETS perl_qtgui4 DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/)
diff --git a/qthelp/lib/CMakeLists.txt b/qthelp/lib/CMakeLists.txt
index dcf5ebe..da817d4 100644
--- a/qthelp/lib/CMakeLists.txt
+++ b/qthelp/lib/CMakeLists.txt
@@ -1,2 +1,2 @@
add_custom_target(qthelp4pm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/QtHelp4.pm ${CMAKE_BINARY_DIR}/blib/lib/QtHelp4.pm)
-install(FILES QtHelp4.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/)
+install(FILES QtHelp4.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/)
diff --git a/qthelp/src/CMakeLists.txt b/qthelp/src/CMakeLists.txt
index c00359d..689cb29 100644
--- a/qthelp/src/CMakeLists.txt
+++ b/qthelp/src/CMakeLists.txt
@@ -37,4 +37,4 @@ target_link_libraries(perl_qthelp4
set_target_properties(perl_qthelp4 PROPERTIES OUTPUT_NAME ${libraryName})
set_target_properties(perl_qthelp4 PROPERTIES PREFIX "")
-install(TARGETS perl_qthelp4 DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/)
+install(TARGETS perl_qthelp4 DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/)
diff --git a/qtmultimedia/lib/CMakeLists.txt b/qtmultimedia/lib/CMakeLists.txt
index e55f697..5384539 100644
--- a/qtmultimedia/lib/CMakeLists.txt
+++ b/qtmultimedia/lib/CMakeLists.txt
@@ -1,2 +1,2 @@
add_custom_target(qtmultimedia4pm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/QtMultimedia4.pm ${CMAKE_BINARY_DIR}/blib/lib/QtMultimedia4.pm)
-install(FILES QtMultimedia4.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/)
+install(FILES QtMultimedia4.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/)
diff --git a/qtmultimedia/src/CMakeLists.txt b/qtmultimedia/src/CMakeLists.txt
index 0728aba..df8e552 100644
--- a/qtmultimedia/src/CMakeLists.txt
+++ b/qtmultimedia/src/CMakeLists.txt
@@ -37,4 +37,4 @@ target_link_libraries(perl_qtmultimedia4
set_target_properties(perl_qtmultimedia4 PROPERTIES OUTPUT_NAME ${libraryName})
set_target_properties(perl_qtmultimedia4 PROPERTIES PREFIX "")
-install(TARGETS perl_qtmultimedia4 DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/)
+install(TARGETS perl_qtmultimedia4 DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/)
diff --git a/qtnetwork/lib/CMakeLists.txt b/qtnetwork/lib/CMakeLists.txt
index 12cd5dd..d1fb0e6 100644
--- a/qtnetwork/lib/CMakeLists.txt
+++ b/qtnetwork/lib/CMakeLists.txt
@@ -1,2 +1,2 @@
add_custom_target(qtnetwork4pm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/QtNetwork4.pm ${CMAKE_BINARY_DIR}/blib/lib/QtNetwork4.pm)
-install(FILES QtNetwork4.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/)
+install(FILES QtNetwork4.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/)
diff --git a/qtnetwork/src/CMakeLists.txt b/qtnetwork/src/CMakeLists.txt
index caf8327..0994d57 100644
--- a/qtnetwork/src/CMakeLists.txt
+++ b/qtnetwork/src/CMakeLists.txt
@@ -39,4 +39,4 @@ target_link_libraries(perl_qtnetwork4
set_target_properties(perl_qtnetwork4 PROPERTIES OUTPUT_NAME ${libraryName})
set_target_properties(perl_qtnetwork4 PROPERTIES PREFIX "")
-install(TARGETS perl_qtnetwork4 DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/)
+install(TARGETS perl_qtnetwork4 DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/)
diff --git a/qtopengl/lib/CMakeLists.txt b/qtopengl/lib/CMakeLists.txt
index f3b5640..d8dc9e4 100644
--- a/qtopengl/lib/CMakeLists.txt
+++ b/qtopengl/lib/CMakeLists.txt
@@ -1,2 +1,2 @@
add_custom_target(qtopengl4pm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/QtOpenGL4.pm ${CMAKE_BINARY_DIR}/blib/lib/QtOpenGL4.pm)
-install(FILES QtOpenGL4.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/)
+install(FILES QtOpenGL4.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/)
diff --git a/qtopengl/src/CMakeLists.txt b/qtopengl/src/CMakeLists.txt
index 20493a9..777af89 100644
--- a/qtopengl/src/CMakeLists.txt
+++ b/qtopengl/src/CMakeLists.txt
@@ -37,4 +37,4 @@ target_link_libraries(perl_qtopengl4
set_target_properties(perl_qtopengl4 PROPERTIES OUTPUT_NAME ${libraryName})
set_target_properties(perl_qtopengl4 PROPERTIES PREFIX "")
-install(TARGETS perl_qtopengl4 DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/)
+install(TARGETS perl_qtopengl4 DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/)
diff --git a/qtscript/lib/CMakeLists.txt b/qtscript/lib/CMakeLists.txt
index d21dbe5..320ff93 100644
--- a/qtscript/lib/CMakeLists.txt
+++ b/qtscript/lib/CMakeLists.txt
@@ -1,2 +1,2 @@
add_custom_target(qtscript4pm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/QtScript4.pm ${CMAKE_BINARY_DIR}/blib/lib/QtScript4.pm)
-install(FILES QtScript4.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/)
+install(FILES QtScript4.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/)
diff --git a/qtscript/src/CMakeLists.txt b/qtscript/src/CMakeLists.txt
index dd395be..6ff47d8 100644
--- a/qtscript/src/CMakeLists.txt
+++ b/qtscript/src/CMakeLists.txt
@@ -37,4 +37,4 @@ target_link_libraries(perl_qtscript4
set_target_properties(perl_qtscript4 PROPERTIES OUTPUT_NAME ${libraryName})
set_target_properties(perl_qtscript4 PROPERTIES PREFIX "")
-install(TARGETS perl_qtscript4 DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/)
+install(TARGETS perl_qtscript4 DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/)
diff --git a/qtsql/lib/CMakeLists.txt b/qtsql/lib/CMakeLists.txt
index 59336d3..d9dd4d5 100644
--- a/qtsql/lib/CMakeLists.txt
+++ b/qtsql/lib/CMakeLists.txt
@@ -1,2 +1,2 @@
add_custom_target(qtsql4pm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/QtSql4.pm ${CMAKE_BINARY_DIR}/blib/lib/QtSql4.pm)
-install(FILES QtSql4.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/)
+install(FILES QtSql4.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/)
diff --git a/qtsql/src/CMakeLists.txt b/qtsql/src/CMakeLists.txt
index 3ec2028..59096ba 100644
--- a/qtsql/src/CMakeLists.txt
+++ b/qtsql/src/CMakeLists.txt
@@ -37,4 +37,4 @@ target_link_libraries(perl_qtsql4
set_target_properties(perl_qtsql4 PROPERTIES OUTPUT_NAME ${libraryName})
set_target_properties(perl_qtsql4 PROPERTIES PREFIX "")
-install(TARGETS perl_qtsql4 DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/)
+install(TARGETS perl_qtsql4 DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/)
diff --git a/qtsvg/lib/CMakeLists.txt b/qtsvg/lib/CMakeLists.txt
index 33f6deb..bf1dc1f 100644
--- a/qtsvg/lib/CMakeLists.txt
+++ b/qtsvg/lib/CMakeLists.txt
@@ -1,2 +1,2 @@
add_custom_target(qtsvg4pm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/QtSvg4.pm ${CMAKE_BINARY_DIR}/blib/lib/QtSvg4.pm)
-install(FILES QtSvg4.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/)
+install(FILES QtSvg4.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/)
diff --git a/qtsvg/src/CMakeLists.txt b/qtsvg/src/CMakeLists.txt
index 11eccd2..449bf0f 100644
--- a/qtsvg/src/CMakeLists.txt
+++ b/qtsvg/src/CMakeLists.txt
@@ -37,4 +37,4 @@ target_link_libraries(perl_qtsvg4
set_target_properties(perl_qtsvg4 PROPERTIES OUTPUT_NAME ${libraryName})
set_target_properties(perl_qtsvg4 PROPERTIES PREFIX "")
-install(TARGETS perl_qtsvg4 DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/)
+install(TARGETS perl_qtsvg4 DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/)
diff --git a/qttest/lib/CMakeLists.txt b/qttest/lib/CMakeLists.txt
index 3bfa78c..5a8d8da 100644
--- a/qttest/lib/CMakeLists.txt
+++ b/qttest/lib/CMakeLists.txt
@@ -1,2 +1,2 @@
add_custom_target(qttest4pm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/QtTest4.pm ${CMAKE_BINARY_DIR}/blib/lib/QtTest4.pm)
-install(FILES QtTest4.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/)
+install(FILES QtTest4.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/)
diff --git a/qttest/src/CMakeLists.txt b/qttest/src/CMakeLists.txt
index 5492e55..d4662b1 100644
--- a/qttest/src/CMakeLists.txt
+++ b/qttest/src/CMakeLists.txt
@@ -38,4 +38,4 @@ target_link_libraries(perl_qttest4
set_target_properties(perl_qttest4 PROPERTIES OUTPUT_NAME ${libraryName})
set_target_properties(perl_qttest4 PROPERTIES PREFIX "")
-install(TARGETS perl_qttest4 DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/)
+install(TARGETS perl_qttest4 DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/)
diff --git a/qtuitools/lib/CMakeLists.txt b/qtuitools/lib/CMakeLists.txt
index 119e40e..3a5f472 100644
--- a/qtuitools/lib/CMakeLists.txt
+++ b/qtuitools/lib/CMakeLists.txt
@@ -1,2 +1,2 @@
add_custom_target(qtuitools4pm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/QtUiTools4.pm ${CMAKE_BINARY_DIR}/blib/lib/QtUiTools4.pm)
-install(FILES QtUiTools4.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/)
+install(FILES QtUiTools4.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/)
diff --git a/qtuitools/src/CMakeLists.txt b/qtuitools/src/CMakeLists.txt
index a8ae4a2..ecc079f 100644
--- a/qtuitools/src/CMakeLists.txt
+++ b/qtuitools/src/CMakeLists.txt
@@ -37,4 +37,4 @@ target_link_libraries(perl_qtuitools4
set_target_properties(perl_qtuitools4 PROPERTIES OUTPUT_NAME ${libraryName})
set_target_properties(perl_qtuitools4 PROPERTIES PREFIX "")
-install(TARGETS perl_qtuitools4 DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/)
+install(TARGETS perl_qtuitools4 DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/)
diff --git a/qtwebkit/lib/CMakeLists.txt b/qtwebkit/lib/CMakeLists.txt
index a02f7ee..3846227 100644
--- a/qtwebkit/lib/CMakeLists.txt
+++ b/qtwebkit/lib/CMakeLists.txt
@@ -1,2 +1,2 @@
add_custom_target(qtwebkit4pm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/QtWebKit4.pm ${CMAKE_BINARY_DIR}/blib/lib/QtWebKit4.pm)
-install(FILES QtWebKit4.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/)
+install(FILES QtWebKit4.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/)
diff --git a/qtwebkit/src/CMakeLists.txt b/qtwebkit/src/CMakeLists.txt
index a6e00f8..dbebc44 100644
--- a/qtwebkit/src/CMakeLists.txt
+++ b/qtwebkit/src/CMakeLists.txt
@@ -37,4 +37,4 @@ target_link_libraries(perl_qtwebkit4
set_target_properties(perl_qtwebkit4 PROPERTIES OUTPUT_NAME ${libraryName})
set_target_properties(perl_qtwebkit4 PROPERTIES PREFIX "")
-install(TARGETS perl_qtwebkit4 DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/)
+install(TARGETS perl_qtwebkit4 DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/)
diff --git a/qtxml/lib/CMakeLists.txt b/qtxml/lib/CMakeLists.txt
index 5505bc4..7db743c 100644
--- a/qtxml/lib/CMakeLists.txt
+++ b/qtxml/lib/CMakeLists.txt
@@ -1,2 +1,2 @@
add_custom_target(qtxml4pm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/QtXml4.pm ${CMAKE_BINARY_DIR}/blib/lib/QtXml4.pm)
-install(FILES QtXml4.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/)
+install(FILES QtXml4.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/)
diff --git a/qtxml/src/CMakeLists.txt b/qtxml/src/CMakeLists.txt
index 018508c..a351609 100644
--- a/qtxml/src/CMakeLists.txt
+++ b/qtxml/src/CMakeLists.txt
@@ -37,4 +37,4 @@ target_link_libraries(perl_qtxml4
set_target_properties(perl_qtxml4 PROPERTIES OUTPUT_NAME ${libraryName})
set_target_properties(perl_qtxml4 PROPERTIES PREFIX "")
-install(TARGETS perl_qtxml4 DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/)
+install(TARGETS perl_qtxml4 DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/)
diff --git a/qtxmlpatterns/lib/CMakeLists.txt b/qtxmlpatterns/lib/CMakeLists.txt
index a35f3df..3d86103 100644
--- a/qtxmlpatterns/lib/CMakeLists.txt
+++ b/qtxmlpatterns/lib/CMakeLists.txt
@@ -1,2 +1,2 @@
add_custom_target(qtxmlpatterns4pm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/QtXmlPatterns4.pm ${CMAKE_BINARY_DIR}/blib/lib/QtXmlPatterns4.pm)
-install(FILES QtXmlPatterns4.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/)
+install(FILES QtXmlPatterns4.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/)
diff --git a/qtxmlpatterns/src/CMakeLists.txt b/qtxmlpatterns/src/CMakeLists.txt
index 9970a98..563e922 100644
--- a/qtxmlpatterns/src/CMakeLists.txt
+++ b/qtxmlpatterns/src/CMakeLists.txt
@@ -37,4 +37,4 @@ target_link_libraries(perl_qtxmlpatterns4
set_target_properties(perl_qtxmlpatterns4 PROPERTIES OUTPUT_NAME ${libraryName})
set_target_properties(perl_qtxmlpatterns4 PROPERTIES PREFIX "")
-install(TARGETS perl_qtxmlpatterns4 DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/)
+install(TARGETS perl_qtxmlpatterns4 DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/)
diff --git a/qwt/lib/CMakeLists.txt b/qwt/lib/CMakeLists.txt
index 0013c4d..d67ffbf 100644
--- a/qwt/lib/CMakeLists.txt
+++ b/qwt/lib/CMakeLists.txt
@@ -1,2 +1,2 @@
add_custom_target(qwtpm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/Qwt.pm ${CMAKE_BINARY_DIR}/blib/lib/Qwt.pm)
-install(FILES Qwt.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/)
+install(FILES Qwt.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/)
diff --git a/qwt/src/CMakeLists.txt b/qwt/src/CMakeLists.txt
index 869d818..b644e80 100644
--- a/qwt/src/CMakeLists.txt
+++ b/qwt/src/CMakeLists.txt
@@ -37,4 +37,4 @@ target_link_libraries(perl_qwt
set_target_properties(perl_qwt PROPERTIES OUTPUT_NAME ${libraryName})
set_target_properties(perl_qwt PROPERTIES PREFIX "")
-install(TARGETS perl_qwt DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/)
+install(TARGETS perl_qwt DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/)

View File

@ -0,0 +1,17 @@
{ kde, cmake, smokeqt, perl }:
kde {
#todo: qscintilla2, qwt5
buildInputs = [ smokeqt perl ];
nativeBuildInputs = [ cmake ];
patches =
# The order is important
[ ./perlqt-include-smokeqt.patch ./perlqt-rewrite-FindPerlMore.patch
./perlqt-use-site-arch-install-dir.patch
];
meta = {
description = "Perl bindings for Qt library";
};
}

View File

@ -0,0 +1,18 @@
diff --git a/kpythonpluginfactory/CMakeLists.txt b/kpythonpluginfactory/CMakeLists.txt
index 41fa0fe..642d867 100644
--- a/kpythonpluginfactory/CMakeLists.txt
+++ b/kpythonpluginfactory/CMakeLists.txt
@@ -3,7 +3,12 @@
set(kpythonpluginfactory_SRCS
kpythonpluginfactory.cpp)
-GET_FILENAME_COMPONENT(LIB_PYTHON ${PYTHON_LIBRARY} NAME)
+option(HARDCODE_LIB_PYTHON_PATH "Whether the path to libpython.so should be hardcoded" OFF)
+if(HARDCODE_LIB_PYTHON_PATH)
+ get_filename_component(LIB_PYTHON ${PYTHON_LIBRARY} REALPATH)
+else(HARDCODE_LIB_PYTHON_PATH)
+ get_filename_component(LIB_PYTHON ${PYTHON_LIBRARY} NAME)
+endif(HARDCODE_LIB_PYTHON_PATH)
ADD_DEFINITIONS(-DLIB_PYTHON=\\"${LIB_PYTHON}\\")
ADD_DEFINITIONS(-DKDE_DEFAULT_DEBUG_AREA=15000)

View File

@ -0,0 +1,32 @@
{ kde, kdelibs, python, sip, pyqt4, kdepimlibs, shared_desktop_ontologies,
boost, lndir }:
let pydir = "lib/python${python.majorVersion}"; in
kde {
#todo: doesn't build
buildInputs = [ python kdepimlibs
# shared_desktop_ontologies boost
];
propagatedBuildInputs = [ pyqt4 sip ];
# patches = [ ./pykde4-hardcode-lib-python.patch ];
cmakeFlags = "-DHARDCODE_LIB_PYTHON_PATH=ON ";
preConfigure =
''
# Symlink PyQt into PyKDE. This is necessary because PyQt looks
# in its PyQt4/uic/widget-plugins directory for plugins, and KDE
# needs to install a plugin.
mkdir -pv $out/${pydir}
${lndir}/bin/lndir ${pyqt4}/${pydir} $out/${pydir}
cmakeFlagsArray=( "-DSIP_DEFAULT_SIP_DIR=$prefix/share/sip" )
'';
meta = {
description = "Python bindings for KDE";
kde.name = "pykde4";
};
}

View File

@ -0,0 +1,13 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 33078b4..1a6ad2e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,7 +5,7 @@ set(COMPILE_RUBY FALSE CACHE INTERNAL "")
find_package(Ruby REQUIRED)
find_package(Qt4 REQUIRED)
find_package(Smoke COMPONENTS QtCore QtGui QtXml QtOpenGl QtSql QtNetwork QtDbus QtSvg Phonon QSci QtDeclarative QtScript QtWebkit QtUiTools QtTest Qwt)
-include_directories(${SMOKE_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/src ${QT_INCLUDES})
+include_directories(${SMOKE_INCLUDE_DIR} ${SMOKE_QTCORE_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/src ${QT_INCLUDES})
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${SMOKE_CMAKE_MODULE_DIR})
include(MacroOptionalFindPackage)

View File

@ -0,0 +1,15 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 33078b4..30aec0e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -31,8 +31,8 @@ if (NOT COMPILE_RUBY)
return()
endif (NOT COMPILE_RUBY)
-SET(CUSTOM_RUBY_SITE_ARCH_DIR ${RUBY_SITEARCH_DIR} CACHE DIR "custom installation directory for ruby binary extension" )
-SET(CUSTOM_RUBY_SITE_LIB_DIR ${RUBY_SITELIB_DIR} CACHE DIR "custom installation directory for ruby extension" )
+string(REPLACE "${RUBY_ROOT_DIR}" "${CMAKE_INSTALL_PREFIX}" CUSTOM_RUBY_SITE_ARCH_DIR ${RUBY_SITEARCH_DIR})
+string(REPLACE "${RUBY_ROOT_DIR}" "${CMAKE_INSTALL_PREFIX}" CUSTOM_RUBY_SITE_LIB_DIR ${RUBY_SITELIB_DIR})
# compute an overall version number which can be compared at once
MATH(EXPR RUBY_VERSION_NUMBER "${RUBY_VERSION_MAJOR}*10000 + ${RUBY_VERSION_MINOR}*100 + ${RUBY_VERSION_PATCH}")

View File

@ -0,0 +1,17 @@
{ kde, cmake, smokeqt, ruby }:
kde {
#todo: scintilla2, qwt5
buildInputs = [ smokeqt ruby ];
nativeBuildInputs = [ cmake ];
# The second patch is not ready for upstream submmission. I should add an
# option() instead.
patches = [ ./qtruby-include-smokeqt.patch ./qtruby-install-prefix.patch ];
cmakeFlags="-DRUBY_ROOT_DIR=${ruby}";
meta = {
description = "Ruby bindings for Qt library";
};
}

View File

@ -0,0 +1,46 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 79945c4..a244d0f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -32,10 +32,6 @@ set(generator_SRC
type.cpp
)
-# force RPATH so that the binary is usable from within the build tree
-set (CMAKE_SKIP_BUILD_RPATH FALSE)
-set (CMAKE_SKIP_RPATH FALSE)
-
configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/config.h.in config.h @ONLY )
add_executable(smokegen ${generator_SRC})
diff --git a/cmake/SmokeConfig.cmake.in b/cmake/SmokeConfig.cmake.in
index 947315c..de8d66c 100644
--- a/cmake/SmokeConfig.cmake.in
+++ b/cmake/SmokeConfig.cmake.in
@@ -44,21 +44,19 @@ macro (find_smoke_component name)
set (SMOKE_${uppercase}_FOUND FALSE CACHE INTERNAL "")
find_path(SMOKE_${uppercase}_INCLUDE_DIR
- ${lowercase}_smoke.h
- PATH ${SMOKE_INCLUDE_DIR}
- NO_DEFAULT_PATH
+ ${lowercase}_smoke.h
+ HINTS ${SMOKE_INCLUDE_DIR}
+ PATH_SUFFIXES smoke
)
if(WIN32)
# DLLs are in the bin directory.
find_library(SMOKE_${uppercase}_LIBRARY
smoke${lowercase}
- PATHS "@CMAKE_INSTALL_PREFIX@/bin"
- NO_DEFAULT_PATH)
+ PATHS "@CMAKE_INSTALL_PREFIX@/bin")
else(WIN32)
find_library(SMOKE_${uppercase}_LIBRARY
smoke${lowercase}
- PATHS "@SMOKE_LIBRARY_PREFIX@"
- NO_DEFAULT_PATH)
+ PATHS "@SMOKE_LIBRARY_PREFIX@")
endif(WIN32)
if (NOT SMOKE_${uppercase}_INCLUDE_DIR OR NOT SMOKE_${uppercase}_LIBRARY)

View File

@ -0,0 +1,13 @@
{ kde, qt4, cmake }:
kde {
buildInputs = [ qt4 ];
nativeBuildInputs = [ cmake ];
patches = [ ./smokegen-nix.patch ];
meta = {
description = "C++ parser used to generate language bindings for Qt/KDE";
license = "GPLv2";
};
}

View File

@ -0,0 +1,16 @@
{ kde, cmake, smokeqt, kdelibs, akonadi, kdepimlibs, okular
, shared_desktop_ontologies, attica, nepomuk_core }:
kde {
# attica, akonadi and kdepimlibs are disabled due to smokegen crash
# okular is disabled because the code generated is broken
buildInputs = [
smokeqt kdelibs shared_desktop_ontologies
];
nativeBuildInputs = [ cmake ];
cmakeFlags = "-DQTDEFINES_FILE=${smokeqt}/share/smokegen/qtdefines";
meta = {
description = "SMOKE bindings for kdelibs";
};
}

View File

@ -0,0 +1,13 @@
{ kde, qt4, cmake, phonon, qimageblitz, smokegen }:
kde {
#todo: Qwt5, QScintilla2
propagatedBuildInputs = [ qt4 phonon qimageblitz ];
nativeBuildInputs = [ cmake ];
propagatedNativeBuildInputs = [ smokegen ];
meta = {
description = "C++ parser used to generate language bindings for Qt/KDE";
license = "GPLv2";
};
}

View File

@ -0,0 +1,8 @@
{ kde, kdelibs, readline }:
kde {
buildInputs = [ kdelibs readline ];
meta = {
description = "Library part of KAlgebra";
};
}

View File

@ -0,0 +1,8 @@
{ kde, kdelibs }:
kde {
buildInputs = [ kdelibs ];
meta = {
description = "Memory Enhancement Game";
};
}

View File

@ -0,0 +1,11 @@
{ kde, kdelibs, libspectre, analitza, rLang, pkgconfig, gfortran, libqalculate }:
kde {
buildInputs = [ kdelibs libspectre analitza rLang gfortran libqalculate];
nativeBuildInputs = [ pkgconfig ];
meta = {
description = "KDE Frontend to Mathematical Software";
};
}

View File

@ -0,0 +1,8 @@
{ kde, kdelibs, libkdeedu, analitza }:
kde {
buildInputs = [ kdelibs libkdeedu analitza ];
meta = {
description = "2D and 3D Graph Calculator";
};
}

View File

@ -0,0 +1,11 @@
{ kde, kdelibs, facile, ocaml, eigen, openbabel, avogadro, pkgconfig }:
kde {
#todo:chemical mime data
buildInputs = [ kdelibs facile ocaml eigen openbabel avogadro ];
nativeBuildInputs = [ pkgconfig ];
meta = {
description = "Periodic Table of Elements";
};
}

View File

@ -0,0 +1,8 @@
{ kde, kdelibs, libkdeedu }:
kde {
buildInputs = [ kdelibs libkdeedu ];
meta = {
description = "Letter Order Game";
};
}

View File

@ -0,0 +1,8 @@
{ kde, kdelibs }:
kde {
buildInputs = [ kdelibs ];
meta = {
description = "Practice Fractions";
};
}

View File

@ -0,0 +1,8 @@
{ kde, kdelibs }:
kde {
buildInputs = [ kdelibs ];
meta = {
description = "Geography Trainer";
};
}

View File

@ -0,0 +1,8 @@
{ kde, kdelibs, libkdeedu }:
kde {
buildInputs = [ kdelibs libkdeedu ];
meta = {
description = "KDE hangman game";
};
}

View File

@ -0,0 +1,12 @@
{ kde, kdelibs, boost, python}:
kde {
buildInputs = [ kdelibs boost python ];
cmakeFlags = ''
-DBOOST_PYTHON_INCLUDES:PATH=${boost}/include;${python}/include/${python.libPrefix}
-DBOOST_PYTHON_LIBS=boost_python;${python.libPrefix} -DKIG_ENABLE_PYTHON_SCRIPTING=1
'';
meta = {
description = "KDE Interactive Geometry";
};
}

View File

@ -0,0 +1,9 @@
{ kde, kdelibs }:
kde {
buildInputs = [ kdelibs ];
meta = {
description = "Japanese Reference/Study Tool";
};
}

View File

@ -0,0 +1,9 @@
{ kde, kdelibs }:
kde {
buildInputs = [ kdelibs ];
meta = {
description = "A KDE alphabet tutorial";
};
}

View File

@ -0,0 +1,12 @@
{ kde, kdelibs }:
kde {
buildInputs = [ kdelibs ];
meta = {
description = "A KDE mathematical function plotter";
kde = {
name = "kmplot";
};
};
}

View File

@ -0,0 +1,10 @@
{ kde, kdelibs, eigen, xplanet, indilib }:
kde {
#todo:wcslib, doesn't build
buildInputs = [ kdelibs eigen xplanet indilib ];
meta = {
description = "A KDE graphical desktop planetarium";
};
}

View File

@ -0,0 +1,9 @@
{ kde, kdelibs, libxkbfile }:
kde {
buildInputs = [ kdelibs libxkbfile ];
meta = {
description = "Touch Typing Tutor";
};
}

View File

@ -0,0 +1,9 @@
{ kde, kdelibs }:
kde {
buildInputs = [ kdelibs ];
meta = {
description = "Educational Programming Environment";
};
}

View File

@ -0,0 +1,9 @@
{ kde, kdelibs, libkdeedu }:
kde {
buildInputs = [ kdelibs libkdeedu ];
meta = {
description = "Flash Card Trainer";
};
}

View File

@ -0,0 +1,8 @@
{ kde, kdelibs }:
kde {
buildInputs = [ kdelibs ];
meta = {
description = "Libraries used by KDE Education applications";
};
}

View File

@ -0,0 +1,10 @@
{ kde, kdelibs, gpsd }:
kde {
#todo: package QextSerialPort, libshp(shapelib), QtMobility, QtLocation, libwlocate
buildInputs = [ kdelibs gpsd ];
meta = {
description = "Marble Virtual Globe";
};
}

View File

@ -0,0 +1,9 @@
{ kde, kdelibs }:
kde {
buildInputs = [ kdelibs ];
meta = {
description = "A memory and pairs game";
};
}

View File

@ -0,0 +1,9 @@
{ kde, kdelibs, libkdeedu, attica }:
kde {
buildInputs = [ kdelibs libkdeedu attica ];
meta = {
description = "Vocabulary Trainer";
};
}

View File

@ -0,0 +1,14 @@
{ kde, kdelibs, boost }:
kde {
buildInputs = [ kdelibs (boost.override { enableExceptions = true; }) ];
NIX_CFLAGS_COMPILE = "-fexceptions";
meta = {
description = "A KDE graph theory viewer";
kde = {
name = "rocs";
};
};
}

View File

@ -0,0 +1,12 @@
{ kde, kdelibs, gsl, libqalculate, eigen }:
kde {
buildInputs = [ kdelibs gsl libqalculate eigen ];
meta = {
description = "A KDE interactive physical simulator";
kde = {
name = "step";
};
};
}

View File

@ -0,0 +1,7 @@
{ kde, kdelibs, libkdegames }:
kde {
buildInputs = [ kdelibs libkdegames ];
meta = {
description = "a single player arcade game. The player is invading various cities in a plane that is decreasing in height";
};
}

View File

@ -0,0 +1,8 @@
{ kde, kdelibs, libkdegames }:
kde {
buildInputs = [ kdelibs libkdegames ];
meta = {
description = "a Gomoku (from Japanese - lit. \"five points\") like game for two players, where the opponents alternate in placing their respective pictogram on the game board";
};
}

View File

@ -0,0 +1,7 @@
{ kde, kdelibs, libkdegames }:
kde {
buildInputs = [ kdelibs libkdegames ];
meta = {
description = "a clone of the classic Bomberman game, inspired by the work of the Clanbomber clone";
};
}

View File

@ -0,0 +1,13 @@
{ kde, kdelibs, libkdegames, pythonPackages, sqlite, pykde4 }:
kde rec {
#todo: doesn't build
buildInputs = [ kdelibs libkdegames pythonPackages.python pythonPackages.wrapPython sqlite ] ++ pythonPath;
pythonPath = [ pythonPackages.twisted pykde4 ];
postInstall = "wrapPythonPrograms";
meta = {
description = "an ancient Chinese board game for 4 players";
};
}

View File

@ -0,0 +1,7 @@
{ kde, kdelibs, libkdegames }:
kde {
buildInputs = [ kdelibs libkdegames ];
meta = {
description = "a clone of the well known game Pac-Man";
};
}

Some files were not shown because too many files have changed in this diff Show More