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

Merge branch 'master' into wxwidgets-3.0.3.1

Browse Source
This commit is contained in:
volth
2017-07-01 00:20:20 +00:00
committed by GitHub
parent bb8759f928 e020640932
commit a720bd45e6
1805 changed files with 45672 additions and 26805 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/development/libraries/SDL/default.nix
View File

@@ -1,14 +1,15 @@
{ stdenv, fetchurl, fetchpatch, pkgconfig, audiofile, libcap
, openglSupport ? false, mesa_noglu, mesa_glu
, alsaSupport ? true, alsaLib
, x11Support ? true, libXext, libICE, libXrandr
, x11Support ? hostPlatform == buildPlatform, libXext, libICE, libXrandr
, pulseaudioSupport ? true, libpulseaudio
, OpenGL, CoreAudio, CoreServices, AudioUnit, Kernel, Cocoa
, hostPlatform, buildPlatform
}:
# OSS is no longer supported, for it's much crappier than ALSA and
# PulseAudio.
assert (stdenv.isLinux && !(stdenv ? cross)) -> alsaSupport || pulseaudioSupport;
assert hostPlatform.isLinux -> alsaSupport || pulseaudioSupport;
let
inherit (stdenv.lib) optional optionals;
@@ -37,7 +38,7 @@ stdenv.mkDerivation rec {
optional stdenv.isDarwin Cocoa;
buildInputs = let
notMingw = !(stdenv ? cross) || stdenv.cross.libc != "msvcrt";
notMingw = !hostPlatform.isMinGW;
in optional notMingw audiofile
++ optionals stdenv.isDarwin [ OpenGL CoreAudio CoreServices AudioUnit Kernel ];
@@ -52,9 +53,8 @@ stdenv.mkDerivation rec {
"--enable-rpath"
"--disable-pulseaudio-shared"
"--disable-osmesa-shared"
] ++ optionals (stdenv ? cross) ([
"--without-x"
] ++ optional alsaSupport "--with-alsa-prefix=${alsaLib.out}/lib");
] ++ optional (!x11Support) "--without-x"
++ optional (alsaSupport && hostPlatform != buildPlatform) "--with-alsa-prefix=${alsaLib.out}/lib";
patches = [
# Fix window resizing issues, e.g. for xmonad

4
pkgs/development/libraries/accounts-qt/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitLab, doxygen, glib, libaccounts-glib, pkgconfig, qtbase, qmakeHook }:
{ stdenv, fetchFromGitLab, doxygen, glib, libaccounts-glib, pkgconfig, qtbase, qmake }:
stdenv.mkDerivation rec {
name = "accounts-qt-${version}";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [ glib libaccounts-glib qtbase ];
nativeBuildInputs = [ doxygen pkgconfig qmakeHook ];
nativeBuildInputs = [ doxygen pkgconfig qmake ];
preConfigure = ''
qmakeFlags="$qmakeFlags LIBDIR=$out/lib CMAKE_CONFIG_PATH=$out/lib/cmake"

9
pkgs/development/libraries/accountsservice/default.nix
View File

@@ -3,15 +3,16 @@
stdenv.mkDerivation rec {
name = "accountsservice-${version}";
version = "0.6.43";
version = "0.6.45";
src = fetchurl {
url = "http://www.freedesktop.org/software/accountsservice/accountsservice-${version}.tar.xz";
sha256 = "1k6n9079001sgcwlkq0bz6mkn4m8y4dwf6hs1qm85swcld5ajfzd";
sha256 = "09pg25ir7kjigvp2cxd9fkfw8c8ql8vrswfvymg9zmbmma9w43zv";
};
buildInputs = [ pkgconfig glib intltool libtool makeWrapper
gobjectIntrospection polkit systemd ];
nativeBuildInputs = [ pkgconfig makeWrapper ];
buildInputs = [ glib intltool libtool gobjectIntrospection polkit systemd ];
configureFlags = [ "--with-systemdsystemunitdir=$(out)/etc/systemd/system"
"--localstatedir=/var" ];

6
pkgs/development/libraries/at-spi2-atk/default.nix
View File

@@ -2,14 +2,14 @@
, intltool, dbus_glib, at_spi2_core, libSM }:
stdenv.mkDerivation rec {
versionMajor = "2.22";
versionMinor = "0";
versionMajor = "2.24";
versionMinor = "1";
moduleName = "at-spi2-atk";
name = "${moduleName}-${versionMajor}.${versionMinor}";
src = fetchurl {
url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz";
sha256 = "e8bdedbeb873eb229eb08c88e11d07713ec25ae175251648ad1a9da6c21113c1";
sha256 = "60dc90ac4f74b8ffe96a9363c25208a443b381bacecfefea6de549f20ed6957d";
};
buildInputs = [ python pkgconfig popt atk libX11 libICE xorg.libXtst libXi

4
pkgs/development/libraries/at-spi2-core/default.nix
View File

@@ -2,14 +2,14 @@
, libX11, xextproto, libSM, libICE, libXtst, libXi, gobjectIntrospection }:
stdenv.mkDerivation rec {
versionMajor = "2.22";
versionMajor = "2.24";
versionMinor = "1";
moduleName = "at-spi2-core";
name = "${moduleName}-${versionMajor}.${versionMinor}";
src = fetchurl {
url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz";
sha256 = "6f8f39f091bfe2c57870cb8bfbb02edac4fc85cda69665e6967937daf7201c42";
sha256 = "1e90d064b937aacfe79a96232ac7e63d28d716e85bd9ff4333f865305a959b5b";
};
outputs = [ "out" "dev" ];

6
pkgs/development/libraries/aubio/default.nix
View File

@@ -3,11 +3,11 @@
}:
stdenv.mkDerivation rec {
name = "aubio-0.4.4";
name = "aubio-0.4.5";
src = fetchurl {
url = "http://aubio.org/pub/${name}.tar.bz2";
sha256 = "1y5zzwv9xjc649g4xrlqnim4q7pcwgzn0xrq3ijbmm5r4ckbkk9a";
sha256 = "1xkshac4wdm7r5sc04c38d6lmvv5sk4qrb5r1yy0xgsgdx781hkh";
};
nativeBuildInputs = [ pkgconfig ];
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Library for audio labelling";
homepage = http://aubio.org/;
homepage = https://aubio.org/;
license = licenses.gpl2;
maintainers = with maintainers; [ goibhniu marcweber fpletz ];
platforms = platforms.linux;

59
pkgs/development/libraries/audio/libbass/default.nix Normal file
View File

@@ -0,0 +1,59 @@
{ stdenv, unzip, fetchurl, writeText }:
let
version = "24";
allBass = {
bass = {
h = "bass.h";
so = {
i686_linux = "libbass.so";
x86_64-linux = "x64/libbass.so";
};
urlpath = "bass${version}-linux.zip";
sha256 = "1a2z9isabkymz7qmkgklbjpj2wxkvv1cngfp9aj0c9178v97pjd7";
};
bass_fx = {
h = "C/bass_fx.h";
so = {
i686_linux = "libbass_fx.so";
x86_64-linux = "x64/libbass_fx.so";
};
urlpath = "z/0/bass_fx${version}-linux.zip";
sha256 = "0j1cbq88j3vnqf2bibcqnfhciz904w48ldgycyh9d8954hwyg22m";
};
};
dropBass = name: bass: stdenv.mkDerivation {
name = "lib${name}-${version}";
src = fetchurl {
url = "https://www.un4seen.com/files/${bass.urlpath}";
inherit (bass) sha256;
};
unpackCmd = ''
mkdir out
${unzip}/bin/unzip $curSrc -d out
'';
lpropagatedBuildInputs = [ unzip ];
dontBuild = true;
installPhase =
let so =
if bass.so ? ${stdenv.system} then bass.so.${stdenv.system}
else abort "${name} not packaged for ${stdenv.system} (yet).";
in ''
mkdir -p $out/{lib,include}
install -m644 -t $out/lib/ ${so}
install -m644 -t $out/include/ ${bass.h}
'';
meta = with stdenv.lib; {
description = "Shareware audio library";
homepage = https://www.un4seen.com/;
license = licenses.unfreeRedistributable;
};
};
in stdenv.lib.mapAttrs dropBass allBass

4
pkgs/development/libraries/audio/lilv/default.nix
View File

@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "lilv-${version}";
version = "0.24.0";
version = "0.24.2";
src = fetchurl {
url = "http://download.drobilla.net/${name}.tar.bz2";
sha256 = "17pv4wdaj7m5ghpfs7h7d8jd105xfzyn2lj438xslj1ndm9xwq7s";
sha256 = "08m5a372pr1l7aii9s3pic5nm68gynx1n1bc7bnlswziq6qnbv7p";
};
buildInputs = [ lv2 pkgconfig python serd sord sratom ];

6
pkgs/development/libraries/audio/ntk/default.nix
View File

@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "ntk-${version}";
version = "2014-10-18";
version = "2017-04-22";
src = fetchgit {
url = "git://git.tuxfamily.org/gitroot/non/fltk.git";
rev = "5719b0044d9f267de5391fab006370cc7f4e70bd";
sha256 = "1wpqy5kk6sk31qyx1c6gdslcqcbczgji6lk8w1l8kri0s908ywyj";
rev = "92365eca0f9a6f054abc70489c009aba0fcde0ff";
sha256 = "0pph7hf07xaa011zr40cs62f3f7hclfbv5kcrl757gcp2s5pi2iq";
};
buildInputs = [

9
pkgs/development/libraries/aws-sdk-cpp/default.nix
View File

@@ -14,13 +14,13 @@ let
else throw "Unsupported system!";
in stdenv.mkDerivation rec {
name = "aws-sdk-cpp-${version}";
version = "1.0.127";
version = "1.0.153";
src = fetchFromGitHub {
owner = "awslabs";
repo = "aws-sdk-cpp";
rev = version;
sha256 = "1p06rkvi6mm4jylk5j7gji2c52qbls3i0yqg3hgs9iys4nd1p14r";
sha256 = "0mglg9a6klmsam8r9va7y5x2s8xylhljwcg93sr8152rvhxnjv08";
};
# FIXME: might be nice to put different APIs in different outputs
@@ -45,6 +45,11 @@ in stdenv.mkDerivation rec {
done
'';
preConfigure =
''
rm aws-cpp-sdk-core-tests/aws/auth/AWSCredentialsProviderTest.cpp
'';
NIX_LDFLAGS = lib.concatStringsSep " " (
(map (pkg: "-rpath ${lib.getOutput "lib" pkg}/lib"))
[ curl openssl zlib stdenv.cc.cc ]);

6
pkgs/development/libraries/boehm-gc/default.nix
View File

@@ -1,4 +1,6 @@
{ lib, stdenv, fetchurl, pkgconfig, libatomic_ops, enableLargeConfig ? false }:
{ lib, stdenv, fetchurl, pkgconfig, libatomic_ops, enableLargeConfig ? false
, buildPlatform, hostPlatform
}:
stdenv.mkDerivation rec {
name = "boehm-gc-7.6.0";
@@ -20,7 +22,7 @@ stdenv.mkDerivation rec {
doCheck = true;
# Don't run the native `strip' when cross-compiling.
dontStrip = stdenv ? cross;
dontStrip = hostPlatform != buildPlatform;
postInstall =
''

17
pkgs/development/libraries/boost/generic.nix
View File

@@ -1,10 +1,11 @@
{ stdenv, fetchurl, icu, expat, zlib, bzip2, python, fixDarwinDylibNames, libiconv
, buildPlatform, hostPlatform
, toolset ? if stdenv.cc.isClang then "clang" else null
, enableRelease ? true
, enableDebug ? false
, enableSingleThreaded ? false
, enableMultiThreaded ? true
, enableShared ? !(stdenv.cross.libc or null == "msvcrt") # problems for now
, enableShared ? !(hostPlatform.libc == "msvcrt") # problems for now
, enableStatic ? !enableShared
, enablePIC ? false
, enableExceptions ? false
@@ -76,11 +77,11 @@ let
"--user-config=user-config.jam"
"toolset=gcc-cross"
"--without-python"
] ++ optionals (stdenv.cross.libc == "msvcrt") [
] ++ optionals (hostPlatform.libc == "msvcrt") [
"target-os=windows"
"threadapi=win32"
"binary-format=pe"
"address-model=${if hasPrefix "x86_64-" stdenv.cross.config then "64" else "32"}"
"address-model=${toString hostPlatform.parsed.cpu.bits}"
"architecture=x86"
];
crossB2Args = concatStringsSep " " (genericB2Flags ++ crossB2Flags);
@@ -110,8 +111,8 @@ let
find include \( -name '*.hpp' -or -name '*.h' -or -name '*.ipp' \) \
-exec sed '1i#line 1 "{}"' -i '{}' \;
)
'' + optionalString (stdenv.cross.libc or null == "msvcrt") ''
${stdenv.cross.config}-ranlib "$out/lib/"*.a
'' + optionalString (hostPlatform.libc == "msvcrt") ''
${stdenv.cc.prefix}ranlib "$out/lib/"*.a
'';
in
@@ -147,13 +148,13 @@ stdenv.mkDerivation {
enableParallelBuilding = true;
buildInputs = [ expat zlib bzip2 libiconv ]
++ stdenv.lib.optionals (! stdenv ? cross) [ python icu ]
++ stdenv.lib.optionals (hostPlatform == buildPlatform) [ python icu ]
++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
configureScript = "./bootstrap.sh";
configureFlags = commonConfigureFlags
++ [ "--with-python=${python.interpreter}" ]
++ optional (! stdenv ? cross) "--with-icu=${icu.dev}"
++ optional (hostPlatform == buildPlatform) "--with-icu=${icu.dev}"
++ optional (toolset != null) "--with-toolset=${toolset}";
buildPhase = builder nativeB2Args;
@@ -177,7 +178,7 @@ stdenv.mkDerivation {
buildPhase = builder crossB2Args;
installPhase = installer crossB2Args;
postFixup = fixup;
} // optionalAttrs (stdenv.cross.libc == "msvcrt") {
} // optionalAttrs (hostPlatform.libc == "msvcrt") {
patches = fetchurl {
url = "https://svn.boost.org/trac/boost/raw-attachment/ticket/7262/"
+ "boost-mingw.patch";

2
pkgs/development/libraries/botan/generic.nix
View File

@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
inherit version;
description = "Cryptographic algorithms library";
maintainers = with maintainers; [ raskin ];
platforms = platforms.unix;
platforms = ["x86_64-linux" "i686-linux" "x86_64-darwin"];
license = licenses.bsd2;
};
passthru.updateInfo.downloadPage = "http://files.randombit.net/botan/";

4
pkgs/development/libraries/cairo/default.nix
View File

@@ -12,11 +12,11 @@ assert glSupport -> mesa_noglu != null;
let inherit (stdenv.lib) optional optionals; in
stdenv.mkDerivation rec {
name = "cairo-1.14.8";
name = "cairo-1.14.10";
src = fetchurl {
url = "http://cairographics.org/releases/${name}.tar.xz";
sha1 = "c6f7b99986f93c9df78653c3e6a3b5043f65145e";
sha256 = "02banr0wxckq62nbhc3mqidfdh2q956i2r7w2hd9bjgjb238g1vy";
};
patches = [

11
pkgs/development/libraries/catch/default.nix
View File

@@ -1,18 +1,17 @@
{ stdenv, cmake, fetchFromGitHub }:
{ stdenv, fetchFromGitHub, cmake }:
stdenv.mkDerivation rec {
name = "catch-${version}";
version = "1.7.0";
version = "1.9.6";
src = fetchFromGitHub {
owner = "philsquared";
repo = "Catch";
rev = "v." + version;
sha256 = "0harki6irc4mqipjc24zyy0jimidr5ng3ss29bnpzbbwhrnkyrgm";
rev = "v${version}";
sha256 = "0nqnyw6haa2771748ycag4hhjb8ni32cv4f7w3h0pji212542xan";
};
buildInputs = [ cmake ];
nativeBuildInputs = [ cmake ];
cmakeFlags = [ "-DUSE_CPP14=ON" ];
doCheck = true;

8
pkgs/development/libraries/chmlib/default.nix
View File

@@ -1,8 +1,8 @@
{stdenv, fetchurl}:
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "chmlib-0.40";
src = fetchurl {
url = "${meta.homepage}/${name}.tar.bz2";
sha256 = "18zzb4x3z0d7fjh1x5439bs62dmgsi4c1pg3qyr7h5gp1i5xcj9l";
@@ -10,8 +10,8 @@ stdenv.mkDerivation rec {
meta = {
homepage = http://www.jedrea.com/chmlib;
license = "LGPL";
license = stdenv.lib.licenses.lgpl2;
description = "A library for dealing with Microsoft ITSS/CHM format files";
platforms = stdenv.lib.platforms.unix;
platforms = ["x86_64-linux" "i686-linux" "x86_64-darwin"];
};
}

2
pkgs/development/libraries/cyrus-sasl/default.nix
View File

@@ -3,7 +3,7 @@
with stdenv.lib;
stdenv.mkDerivation rec {
name = "cyrus-sasl-${version}${optionalString (kerberos == null) "-without-kerberos"}";
version = "2.5.10";
version = "2.1.26";
src = fetchurl {
url = "ftp://ftp.cyrusimap.org/cyrus-sasl/${name}.tar.gz";

6
pkgs/development/libraries/expat/default.nix
View File

@@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "expat-2.2.0";
name = "expat-2.2.1";
src = fetchurl {
url = "mirror://sourceforge/expat/${name}.tar.bz2";
sha256 = "1zq4lnwjlw8s9mmachwfvfjf2x3lk24jm41746ykhdcvs7r0zrfr";
sha256 = "11c8jy1wvllvlk7xdc5cm8hdhg0hvs8j0aqy6s702an8wkdcls0q";
};
outputs = [ "out" "dev" ]; # TODO: fix referrers
@@ -17,6 +17,8 @@ stdenv.mkDerivation rec {
doCheck = true;
preCheck = "patchShebangs ./run.sh";
meta = with stdenv.lib; {
homepage = http://www.libexpat.org/;
description = "A stream-oriented XML parser library written in C";

32
pkgs/development/libraries/ffmpeg-full/default.nix
View File

@@ -1,4 +1,5 @@
{ stdenv, fetchurl, pkgconfig, perl, texinfo, yasm
, hostPlatform
/*
* Licensing options (yes some are listed twice, filters and such are not listed)
*/
@@ -230,11 +231,11 @@ assert nvenc -> nvidia-video-sdk != null && nonfreeLicensing;
stdenv.mkDerivation rec {
name = "ffmpeg-full-${version}";
version = "3.3.1";
version = "3.3.2";
src = fetchurl {
url = "https://www.ffmpeg.org/releases/ffmpeg-${version}.tar.xz";
sha256 = "0bwgm6z6k3khb91qh9xv15inykkfchpkm0lcdckkxhkacpyaf0mp";
sha256 = "11974vcfsy8w0i6f4lfwqmg80xkfybqw7vw6zzrcn5i6ncddx60r";
};
patchPhase = ''patchShebangs .
@@ -428,30 +429,13 @@ stdenv.mkDerivation rec {
/* Cross-compilation is untested, consider this an outline, more work
needs to be done to portions of the build to get it to work correctly */
crossAttrs = let
os = ''
if [ "${stdenv.cross.config}" = "*cygwin*" ] ; then
# Probably should look for mingw too
echo "cygwin"
elif [ "${stdenv.cross.config}" = "*darwin*" ] ; then
echo "darwin"
elif [ "${stdenv.cross.config}" = "*freebsd*" ] ; then
echo "freebsd"
elif [ "${stdenv.cross.config}" = "*linux*" ] ; then
echo "linux"
elif [ "${stdenv.cross.config}" = "*netbsd*" ] ; then
echo "netbsd"
elif [ "${stdenv.cross.config}" = "*openbsd*" ] ; then
echo "openbsd"
fi
'';
in {
dontSetConfigureCross = true;
crossAttrs = {
configurePlatforms = [];
configureFlags = configureFlags ++ [
"--cross-prefix=${stdenv.cross.config}-"
"--cross-prefix=${stdenv.cc.prefix}"
"--enable-cross-compile"
"--target_os=${os}"
"--arch=${stdenv.cross.arch}"
"--target_os=${hostPlatform.parsed.kernel.name}"
"--arch=${hostPlatform.arch}"
];
};

4
pkgs/development/libraries/ffmpeg/3.3.nix
View File

@@ -6,7 +6,7 @@
callPackage ./generic.nix (args // rec {
version = "${branch}";
branch = "3.3.1";
sha256 = "0c37bdqwmaziikr2d5pqp7504ail6i7a1mfcmc06mdpwfxxwvcpw";
branch = "3.3.2";
sha256 = "0slf12dxk6wq1ns09kqqqrzwylxcy0isvc3niyxig45gq3ah0s91";
darwinFrameworks = [ Cocoa CoreMedia ];
})

28
pkgs/development/libraries/ffmpeg/generic.nix
View File

@@ -2,6 +2,7 @@
, alsaLib, bzip2, fontconfig, freetype, gnutls, libiconv, lame, libass, libogg
, libtheora, libva, libvorbis, libvpx, lzma, libpulseaudio, soxr
, x264, x265, xvidcore, zlib, libopus
, hostPlatform
, openglSupport ? false, mesa ? null
# Build options
, runtimeCpuDetectBuild ? true # Detect CPU capabilities at runtime
@@ -169,30 +170,13 @@ stdenv.mkDerivation rec {
/* Cross-compilation is untested, consider this an outline, more work
needs to be done to portions of the build to get it to work correctly */
crossAttrs = let
os = ''
if [ "${stdenv.cross.config}" = "*cygwin*" ] ; then
# Probably should look for mingw too
echo "cygwin"
elif [ "${stdenv.cross.config}" = "*darwin*" ] ; then
echo "darwin"
elif [ "${stdenv.cross.config}" = "*freebsd*" ] ; then
echo "freebsd"
elif [ "${stdenv.cross.config}" = "*linux*" ] ; then
echo "linux"
elif [ "${stdenv.cross.config}" = "*netbsd*" ] ; then
echo "netbsd"
elif [ "${stdenv.cross.config}" = "*openbsd*" ] ; then
echo "openbsd"
fi
'';
in {
dontSetConfigureCross = true;
crossAttrs = {
configurePlatforms = [];
configureFlags = configureFlags ++ [
"--cross-prefix=${stdenv.cross.config}-"
"--cross-prefix=${stdenv.cc.prefix}"
"--enable-cross-compile"
"--target_os=${os}"
"--arch=${stdenv.cross.arch}"
"--target_os=${hostPlatform.parsed.kernel}"
"--arch=${hostPlatform.arch}"
];
};

6
pkgs/development/libraries/fontconfig/2.10.nix
View File

@@ -1,4 +1,6 @@
{ stdenv, fetchurl, pkgconfig, freetype, expat }:
{ stdenv, fetchurl, pkgconfig, freetype, expat
, hostPlatform
}:
stdenv.mkDerivation rec {
name = "fontconfig-2.10.2";
@@ -21,7 +23,7 @@ stdenv.mkDerivation rec {
];
# We should find a better way to access the arch reliably.
crossArch = stdenv.cross.arch or null;
crossArch = hostPlatform.arch or null;
preConfigure = ''
if test -n "$crossConfig"; then

8
pkgs/development/libraries/fontconfig/default.nix
View File

@@ -1,5 +1,7 @@
{ stdenv, fetchurl, fetchpatch, pkgconfig, freetype, expat, libxslt, dejavu_fonts
, substituteAll }:
{ stdenv, substituteAll, fetchurl, fetchpatch
, pkgconfig, freetype, expat, libxslt, dejavu_fonts
, hostPlatform
}:
/** Font configuration scheme
- ./config-compat.patch makes fontconfig try the following root configs, in order:
@@ -53,7 +55,7 @@ stdenv.mkDerivation rec {
];
# We should find a better way to access the arch reliably.
crossArch = stdenv.cross.arch or null;
crossArch = hostPlatform.arch or null;
preConfigure = ''
if test -n "$crossConfig"; then

14
pkgs/development/libraries/freetype/default.nix
View File

@@ -1,12 +1,12 @@
{
stdenv, lib, fetchurl, copyPathsToStore,
pkgconfig, which,
zlib, bzip2, libpng, gnumake, glib,
{ stdenv, lib, fetchurl, copyPathsToStore
, hostPlatform
, pkgconfig, which
, zlib, bzip2, libpng, gnumake, glib
# FreeType supports LCD filtering (colloquially referred to as sub-pixel rendering).
, # FreeType supports LCD filtering (colloquially referred to as sub-pixel rendering).
# LCD filtering is also known as ClearType and covered by several Microsoft patents.
# This option allows it to be disabled. See http://www.freetype.org/patents.html.
useEncumberedCode ? true,
useEncumberedCode ? true
}:
let
@@ -67,7 +67,7 @@ in stdenv.mkDerivation {
postInstall = glib.flattenInclude;
crossAttrs = stdenv.lib.optionalAttrs (stdenv.cross.libc or null != "msvcrt") {
crossAttrs = stdenv.lib.optionalAttrs (hostPlatform.libc or null != "msvcrt") {
# Somehow it calls the unwrapped gcc, "i686-pc-linux-gnu-gcc", instead
# of gcc. I think it's due to the unwrapped gcc being in the PATH. I don't
# know why it's on the PATH.

16
pkgs/development/libraries/glew/1.10.nix
View File

@@ -1,5 +1,7 @@
{ stdenv, fetchurl, mesa_glu, x11, libXmu, libXi
, AGL ? null }:
, buildPlatform, hostPlatform
, AGL ? null
}:
with stdenv.lib;
@@ -17,7 +19,7 @@ stdenv.mkDerivation rec {
patchPhase = ''
sed -i 's|lib64|lib|' config/Makefile.linux
${optionalString (stdenv ? cross) ''
${optionalString (hostPlatform != buildPlatform) ''
sed -i -e 's/\(INSTALL.*\)-s/\1/' Makefile
''}
'';
@@ -36,13 +38,9 @@ stdenv.mkDerivation rec {
cp -r README.txt LICENSE.txt doc $out/share/doc/glew
'';
crossAttrs.makeFlags = [
"CC=${stdenv.cross.config}-gcc"
"LD=${stdenv.cross.config}-gcc"
"AR=${stdenv.cross.config}-ar"
"STRIP="
] ++ optional (stdenv.cross.libc == "msvcrt") "SYSTEM=mingw"
++ optional (stdenv.cross.libc == "libSystem") "SYSTEM=darwin";
makeFlags = if hostPlatform == buildPlatform then null else [
"SYSTEM=${if hostPlatform.isMinGW then "mingw" else hostPlatform.parsed.kernel}"
];
meta = with stdenv.lib; {
description = "An OpenGL extension loading library for C(++)";

16
pkgs/development/libraries/glew/default.nix
View File

@@ -1,4 +1,6 @@
{ stdenv, fetchurl, mesa_glu, xlibsWrapper, libXmu, libXi }:
{ stdenv, fetchurl, mesa_glu, xlibsWrapper, libXmu, libXi
, buildPlatform, hostPlatform
}:
with stdenv.lib;
@@ -17,7 +19,7 @@ stdenv.mkDerivation rec {
patchPhase = ''
sed -i 's|lib64|lib|' config/Makefile.linux
${optionalString (stdenv ? cross) ''
${optionalString (hostPlatform != buildPlatform) ''
sed -i -e 's/\(INSTALL.*\)-s/\1/' Makefile
''}
'';
@@ -37,13 +39,9 @@ stdenv.mkDerivation rec {
rm $out/lib/*.a
'';
crossAttrs.makeFlags = [
"CC=${stdenv.cross.config}-gcc"
"LD=${stdenv.cross.config}-gcc"
"AR=${stdenv.cross.config}-ar"
"STRIP="
] ++ optional (stdenv.cross.libc == "msvcrt") "SYSTEM=mingw"
++ optional (stdenv.cross.libc == "libSystem") "SYSTEM=darwin";
makeFlags = if hostPlatform == buildPlatform then null else [
"SYSTEM=${if hostPlatform.isMinGW then "mingw" else hostPlatform.parsed.kernel}"
];
meta = with stdenv.lib; {
description = "An OpenGL extension loading library for C(++)";

4
pkgs/development/libraries/glpk/default.nix
View File

@@ -1,11 +1,11 @@
{ fetchurl, stdenv }:
stdenv.mkDerivation rec {
name = "glpk-4.61";
name = "glpk-4.62";
src = fetchurl {
url = "mirror://gnu/glpk/${name}.tar.gz";
sha256 = "1adbvwiaqrv9pql9ry3lhn2vfsxnff2vh4fs477d90kpfx0xwrlq";
sha256 = "0w7s3869ybwyq9a4490dikpib1qp3jnn5nqz1vvwqy1qz3ilnvh9";
};
doCheck = true;

6
pkgs/development/libraries/gnutls/3.5.nix
View File

@@ -1,11 +1,11 @@
{ callPackage, fetchurl, libunistring, ... } @ args:
{ callPackage, fetchurl, ... } @ args:
callPackage ./generic.nix (args // rec {
version = "3.5.12";
version = "3.5.13";
src = fetchurl {
url = "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.5/gnutls-${version}.tar.xz";
sha256 = "1jspvrmydqgz30c1ji94b55gr2dynz7p96p4y8fkhad0xajkkjv3";
sha256 = "15ihq6p0hnnhs8cnjrkj40dmlcaa1jjg8xg0g2ydbnlqs454ixbr";
};
# Skip two tests introduced in 3.5.11. Probable reasons of failure:

3
pkgs/development/libraries/gnutls/generic.nix
View File

@@ -1,5 +1,5 @@
{ lib, fetchurl, stdenv, zlib, lzo, libtasn1, nettle, pkgconfig, lzip
, guileBindings, guile, perl, gmp, autogen, libidn, p11_kit, unbound, libiconv
, guileBindings, guile, perl, gmp, autogen, libidn, p11_kit, libiconv
, tpmSupport ? false, trousers, which, nettools, libunistring
# Version dependent args
@@ -40,7 +40,6 @@ stdenv.mkDerivation {
buildInputs = [ lzo lzip libtasn1 libidn p11_kit zlib gmp autogen libunistring ]
++ lib.optional (stdenv.isFreeBSD || stdenv.isDarwin) libiconv
++ lib.optional (tpmSupport && stdenv.isLinux) trousers
++ [ unbound ]
++ lib.optional guileBindings guile
++ buildInputs;

6
pkgs/development/libraries/goffice/default.nix
View File

@@ -2,11 +2,11 @@
, libgsf, libxml2, libxslt, cairo, pango, librsvg, libspectre }:
stdenv.mkDerivation rec {
name = "goffice-0.10.32";
name = "goffice-0.10.34";
src = fetchurl {
url = "mirror://gnome/sources/goffice/0.10/${name}.tar.xz";
sha256 = "02b37da9f54fb92725b973875d1d2da49b54f6486eb03648fd1ea58e4a297ac3";
sha256 = "554a75a22b5863b3b17595148bee6462122f2dbf031dfa78b61e941e3c2dd603";
};
nativeBuildInputs = [ pkgconfig intltool ];
@@ -31,6 +31,6 @@ stdenv.mkDerivation rec {
license = stdenv.lib.licenses.gpl2Plus;
platforms = stdenv.lib.platforms.gnu;
platforms = stdenv.lib.platforms.unix;
};
}

19
pkgs/development/libraries/gpgme/default.nix
View File

@@ -1,4 +1,7 @@
{ stdenv, fetchurl, libgpgerror, gnupg, pkgconfig, glib, pth, libassuan }:
{ stdenv, fetchurl, fetchpatch, libgpgerror, gnupg, pkgconfig, glib, pth, libassuan
, qtbase ? null }:
let inherit (stdenv) lib system; in
stdenv.mkDerivation rec {
name = "gpgme-1.9.0";
@@ -8,10 +11,20 @@ stdenv.mkDerivation rec {
sha256 = "1ssc0gs02r4fasabk7c6v6r865k2j02mpb5g1vkpbmzsigdzwa8v";
};
patches = [
(fetchpatch {
url = "https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgme.git;a=commitdiff_plain;h=5d4f977dac542340c877fdd4b1304fa8f6e058e6";
sha256 = "0swpxzd3x3b6h2ry2py9j8l0xp3vdw8rixxhgfavzia5p869qyyx";
name = "qgpgme-format-security.patch";
})
];
outputs = [ "out" "dev" "info" ];
outputBin = "dev"; # gpgme-config; not so sure about gpgme-tool
propagatedBuildInputs = [ libgpgerror glib libassuan pth ];
propagatedBuildInputs =
[ libgpgerror glib libassuan pth ]
++ lib.optional (qtbase != null) qtbase;
nativeBuildInputs = [ pkgconfig gnupg ];
@@ -21,7 +34,7 @@ stdenv.mkDerivation rec {
# https://www.gnupg.org/documentation/manuals/gpgme/Largefile-Support-_0028LFS_0029.html
NIX_CFLAGS_COMPILE =
with stdenv; lib.optional (system == "i686-linux") "-D_FILE_OFFSET_BITS=64";
lib.optional (system == "i686-linux") "-D_FILE_OFFSET_BITS=64";
meta = with stdenv.lib; {
homepage = "https://gnupg.org/software/gpgme/index.html";

12
pkgs/development/libraries/gpgme/gpgme_libsuffix.patch Normal file
View File

@@ -0,0 +1,12 @@
diff --git a/lang/cpp/src/GpgmeppConfig.cmake.in.in b/lang/cpp/src/GpgmeppConfig.cmake.in.in
index 928d19f..cbe9713 100644 (file)
--- a/lang/cpp/src/GpgmeppConfig.cmake.in.in
+++ b/lang/cpp/src/GpgmeppConfig.cmake.in.in
@@ -63,7 +63,7 @@ add_library(Gpgmepp SHARED IMPORTED)
set_target_properties(Gpgmepp PROPERTIES
INTERFACE_INCLUDE_DIRECTORIES "@resolved_includedir@/gpgme++;@resolved_includedir@"
- INTERFACE_LINK_LIBRARIES "pthread;@resolved_libdir@/libgpgme@libsuffix@;@LIBASSUAN_LIBS@"
+ INTERFACE_LINK_LIBRARIES "pthread;@resolved_libdir@/libgpgme.so;@LIBASSUAN_LIBS@"
IMPORTED_LOCATION "@resolved_libdir@/libgpgmepp.so"
)

4
pkgs/development/libraries/grib-api/default.nix
View File

@@ -25,6 +25,10 @@ stdenv.mkDerivation rec{
pythonPackages.python
];
propagatedBuildInputs = stdenv.lib.optionals enablePython [
pythonPackages.numpy
];
cmakeFlags = [ "-DENABLE_PYTHON=${if enablePython then "ON" else "OFF"}"
"-DENABLE_PNG=ON"
"-DENABLE_FORTRAN=ON"

4
pkgs/development/libraries/gsl/default.nix
View File

@@ -1,11 +1,11 @@
{ fetchurl, fetchpatch, stdenv }:
stdenv.mkDerivation rec {
name = "gsl-2.3";
name = "gsl-2.4";
src = fetchurl {
url = "mirror://gnu/gsl/${name}.tar.gz";
sha256 = "1yxdzqjwmi2aid650fa9zyr8llw069x7lm489wx9nnfdi6vh09an";
sha256 = "16yfs5n444s03np1naj6yp1fsysd42kdscxzkg0k2yvfjixx0ijd";
};
patches = [

3
pkgs/development/libraries/gstreamer/bad/default.nix
View File

@@ -6,6 +6,7 @@
, wildmidi, fluidsynth, libvdpau, wayland
, libwebp, xvidcore, gnutls, mjpegtools
, mesa, libintlOrEmpty, libgme
, openssl, x265, libxml2
}:
assert faacSupport -> faac != null;
@@ -45,7 +46,7 @@ stdenv.mkDerivation rec {
openjpeg libopus librsvg
fluidsynth libvdpau
libwebp xvidcore gnutls mesa
mjpegtools libgme
mjpegtools libgme openssl x265 libxml2
]
++ libintlOrEmpty
++ optional faacSupport faac

6
pkgs/development/libraries/gtk+/3.x.nix
View File

@@ -13,7 +13,7 @@ with stdenv.lib;
let
ver_maj = "3.22";
ver_min = "12";
ver_min = "15";
version = "${ver_maj}.${ver_min}";
in
stdenv.mkDerivation rec {
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://gnome/sources/gtk+/${ver_maj}/gtk+-${version}.tar.xz";
sha256 = "84fae0cefb6a11ee2b4e86b8ac42fe46a3d30b4ad16661d5fc51e8ae03e2a98c";
sha256 = "c8a012c2a99132629ab043f764a2b7cb6388483a015cd15c7a4288bec3590fdb";
};
outputs = [ "out" "dev" ];
@@ -65,6 +65,8 @@ stdenv.mkDerivation rec {
--replace '-L${gmp.dev}/lib' '-L${gmp.out}/lib'
# The updater is needed for nixos env and it's tiny.
moveToOutput bin/gtk-update-icon-cache "$out"
# Launcher
moveToOutput bin/gtk-launch "$out"
'';
meta = with stdenv.lib; {

98
pkgs/development/libraries/gtkd/default.nix Normal file
View File

@@ -0,0 +1,98 @@
{ stdenv, fetchzip, atk, cairo, dmd, gdk_pixbuf, gnome3, gst_all_1, librsvg
, pango, pkgconfig, substituteAll, which }:
stdenv.mkDerivation rec {
name = "gtkd-${version}";
version = "3.6.5";
src = fetchzip {
url = "https://gtkd.org/Downloads/sources/GtkD-${version}.zip";
sha256 = "1ypxxqklad5wwyvc39wnphnqp5y4q5zbf9j5mxb3bg9vnls48vx1";
stripRoot = false;
};
nativeBuildInputs = [ dmd pkgconfig which ];
propagatedBuildInputs = [
atk cairo gdk_pixbuf glib gstreamer gst_plugins_base gtk3 gtksourceview
libgda libpeas librsvg pango vte
];
prePatch = ''
substituteAll ${./paths.d} generated/gtkd/gtkd/paths.d
substituteInPlace src/cairo/gtkc/cairo-compiletime.d \
--replace libcairo.so.2 ${cairo}/lib/libcairo.so.2 \
--replace libcairo.dylib ${cairo}/lib/libcairo.dylib
substituteInPlace src/cairo/gtkc/cairo-runtime.d \
--replace libcairo.so.2 ${cairo}/lib/libcairo.so.2 \
--replace libcairo.dylib ${cairo}/lib/libcairo.dylib
substituteInPlace generated/gtkd/gtkc/gdkpixbuf.d \
--replace libgdk_pixbuf-2.0.so.0 ${gdk_pixbuf}/lib/libgdk_pixbuf-2.0.so.0 \
--replace libgdk_pixbuf-2.0.0.dylib ${gdk_pixbuf}/lib/libgdk_pixbuf-2.0.0.dylib
substituteInPlace generated/gtkd/gtkc/atk.d \
--replace libatk-1.0.so.0 ${atk}/lib/libatk-1.0.so.0 \
--replace libatk-1.0.0.dylib ${atk}/lib/libatk-1.0.0.dylib
substituteInPlace generated/gtkd/gtkc/pango.d \
--replace libpango-1.0.so.0 ${pango.out}/lib/libpango-1.0.so.0 \
--replace libpangocairo-1.0.so.0 ${pango.out}/lib/libpangocairo-1.0.so.0 \
--replace libpango-1.0.0.dylib ${pango.out}/lib/libpango-1.0.0.dylib \
--replace libpangocairo-1.0.0.dylib ${pango.out}/lib/libpangocairo-1.0.0.dylib
substituteInPlace generated/gtkd/gtkc/gobject.d \
--replace libgobject-2.0.so.0 ${glib}/lib/libgobject-2.0.so.0 \
--replace libgobject-2.0.0.dylib ${glib}/lib/libgobject-2.0.0.dylib
substituteInPlace generated/gtkd/gtkc/rsvg.d \
--replace librsvg-2.so.2 ${librsvg}/lib/librsvg-2.so.2 \
--replace librsvg-2.2.dylib ${librsvg}/lib/librsvg-2.2.dylib
substituteInPlace generated/gtkd/gtkc/cairo.d \
--replace libcairo.so.2 ${cairo}/lib/libcairo.so.2 \
--replace libcairo.dylib ${cairo}/lib/libcairo.dylib
substituteInPlace generated/gtkd/gtkc/gdk.d \
--replace libgdk-3.so.0 ${gtk3}/lib/libgdk-3.so.0 \
--replace libgdk-3.0.dylib ${gtk3}/lib/libgdk-3.0.dylib
substituteInPlace generated/peas/peasc/peas.d \
--replace libpeas-1.0.so.0 ${libpeas}/lib/libpeas-1.0.so.0 \
--replace libpeas-gtk-1.0.so.0 ${libpeas}/lib/libpeas-gtk-1.0.so.0 \
--replace libpeas-1.0.0.dylib ${libpeas}/lib/libpeas-1.0.0.dylib \
--replace gtk-1.0.0.dylib ${libpeas}/lib/gtk-1.0.0.dylib
substituteInPlace generated/vte/vtec/vte.d \
--replace libvte-2.91.so.0 ${vte}/lib/libvte-2.91.so.0 \
--replace libvte-2.91.0.dylib ${vte}/lib/libvte-2.91.0.dylib
substituteInPlace generated/gstreamer/gstreamerc/gstinterfaces.d \
--replace libgstvideo-1.0.so.0 ${gst_plugins_base}/lib/libgstvideo-1.0.so.0 \
--replace libgstvideo-1.0.0.dylib ${gst_plugins_base}/lib/libgstvideo-1.0.0.dylib
substituteInPlace generated/sourceview/gsvc/gsv.d \
--replace libgtksourceview-3.0.so.1 ${gtksourceview}/lib/libgtksourceview-3.0.so.1 \
--replace libgtksourceview-3.0.1.dylib ${gtksourceview}/lib/libgtksourceview-3.0.1.dylib
substituteInPlace generated/gtkd/gtkc/glib.d \
--replace libglib-2.0.so.0 ${glib}/lib/libglib-2.0.so.0 \
--replace libgmodule-2.0.so.0 ${glib}/lib/libgmodule-2.0.so.0 \
--replace libgobject-2.0.so.0 ${glib}/lib/libgobject-2.0.so.0 \
--replace libglib-2.0.0.dylib ${glib}/lib/libglib-2.0.0.dylib \
--replace libgmodule-2.0.0.dylib ${glib}/lib/libgmodule-2.0.0.dylib \
--replace libgobject-2.0.0.dylib ${glib}/lib/libgobject-2.0.0.dylib
substituteInPlace generated/gtkd/gtkc/gio.d \
--replace libgio-2.0.so.0 ${glib}/lib/libgio-2.0.so.0 \
--replace libgio-2.0.0.dylib ${glib}/lib/libgio-2.0.0.dylib
substituteInPlace generated/gstreamer/gstreamerc/gstreamer.d \
--replace libgstreamer-1.0.so.0 ${gstreamer}/lib/libgstreamer-1.0.so.0 \
--replace libgstreamer-1.0.0.dylib ${gstreamer}/lib/libgstreamer-1.0.0.dylib
substituteInPlace generated/gtkd/gtkc/gtk.d \
--replace libgdk-3.so.0 ${gtk3}/lib/libgdk-3.so.0 \
--replace libgtk-3.so.0 ${gtk3}/lib/libgtk-3.so.0 \
--replace libgdk-3.0.dylib ${gtk3}/lib/libgdk-3.0.dylib \
--replace libgtk-3.0.dylib ${gtk3}/lib/libgtk-3.0.dylib
'';
installFlags = "prefix=$(out)";
inherit atk cairo gdk_pixbuf librsvg pango;
inherit (gnome3) glib gtk3 gtksourceview libgda libpeas vte;
inherit (gst_all_1) gstreamer;
gst_plugins_base = gst_all_1.gst-plugins-base;
meta = with stdenv.lib; {
description = "D binding and OO wrapper for GTK+";
homepage = "https://gtkd.org";
licence = licenses.lgpl3Plus;
platforms = platforms.linux ++ platforms.darwin;
};
}

142
pkgs/development/libraries/gtkd/paths.d Normal file
View File

@@ -0,0 +1,142 @@
/*
* gtkD is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License
* as published by the Free Software Foundation; either version 3
* of the License, or (at your option) any later version, with
* some exceptions, please read the COPYING file.
*
* gtkD is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with gtkD; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110, USA
*
* paths.d -- list of libraries that will be dynamically linked with gtkD
*
* Added: John Reimer -- 2004-12-20
* Updated: 2005-02-21 changed names; added version(linux)
* Updated: 2005-05-05 updated Linux support
* Updated: 2008-02-16 Tango support
*/
module gtkd.paths;
/*
* Define the Libraries that gtkD will be using.
* This is a growable list, as long as the programmer
* also adds to the importLibs list.
*/
enum LIBRARY
{
ATK,
CAIRO,
GDK,
GDKPIXBUF,
GLIB,
GMODULE,
GOBJECT,
GIO,
GTHREAD,
GTK,
PANGO,
PANGOCAIRO,
GLGDK,
GLGTK,
GDA,
GSV,
GSV1,
GSTREAMER,
GSTINTERFACES,
VTE,
PEAS,
RSVG,
}
version (Windows)
{
const string[LIBRARY.max+1] importLibs =
[
LIBRARY.ATK: "libatk-1.0-0.dll",
LIBRARY.CAIRO: "libcairo-2.dll",
LIBRARY.GDK: "libgdk-3-0.dll",
LIBRARY.GDKPIXBUF: "libgdk_pixbuf-2.0-0.dll",
LIBRARY.GLIB: "libglib-2.0-0.dll",
LIBRARY.GMODULE: "libgmodule-2.0-0.dll",
LIBRARY.GOBJECT: "libgobject-2.0-0.dll",
LIBRARY.GIO: "libgio-2.0-0.dll",
LIBRARY.GTHREAD: "libgthread-2.0-0.dll",
LIBRARY.GTK: "libgtk-3-0.dll",
LIBRARY.PANGO: "libpango-1.0-0.dll",
LIBRARY.PANGOCAIRO: "libpangocairo-1.0-0.dll",
LIBRARY.GLGDK: "libgdkglext-3.0-0.dll",
LIBRARY.GLGTK: "libgtkglext-3.0-0.dll",
LIBRARY.GDA: "libgda-4.0-4.dll",
LIBRARY.GSV: "libgtksourceview-3.0-0.dll",
LIBRARY.GSV1: "libgtksourceview-3.0-1.dll",
LIBRARY.GSTREAMER: "libgstreamer-1.0.dll",
LIBRARY.GSTINTERFACES: "libgstvideo-1.0.dll",
LIBRARY.VTE: "libvte-2.91.dll",
LIBRARY.PEAS: "libpeas-1.0.dll",
LIBRARY.RSVG: "librsvg-2-2.dll",
];
}
else version(darwin)
{
const string[LIBRARY.max+1] importLibs =
[
LIBRARY.ATK: "@atk@/lib/libatk-1.0.dylib",
LIBRARY.CAIRO: "@cairo@/lib/libcairo.dylib",
LIBRARY.GDK: "@gtk3@/lib/libgdk-3.0.dylib",
LIBRARY.GDKPIXBUF: "@gdk_pixbuf@/lib/libgdk_pixbuf-2.0.dylib",
LIBRARY.GLIB: "@glib@/lib/libglib-2.0.dylib",
LIBRARY.GMODULE: "@glib@/lib/libgmodule-2.0.dylib",
LIBRARY.GOBJECT: "@glib@/lib/libgobject-2.0.dylib",
LIBRARY.GIO: "@glib@/lib/libgio-2.0.dylib",
LIBRARY.GTHREAD: "@glib@/lib/libgthread-2.0.dylib",
LIBRARY.GTK: "@gtk3@/lib/libgtk-3.0.dylib",
LIBRARY.PANGO: "@pango@/lib/libpango-1.0.dylib",
LIBRARY.PANGOCAIRO: "@pango@/lib/libpangocairo-1.0.dylib",
LIBRARY.GLGDK: "libgdkglext-3.0.dylib",
LIBRARY.GLGTK: "libgtkglext-3.0.dylib",
LIBRARY.GDA: "@libgda@/lib/libgda-2.dylib",
LIBRARY.GSV: "@gtksourceview@/lib/libgtksourceview-3.0.dylib",
LIBRARY.GSV1: "@gtksourceview@/lib/libgtksourceview-3.0.dylib",
LIBRARY.GSTREAMER: "@gstreamer@/lib/libgstreamer-1.0.dylib",
LIBRARY.GSTINTERFACES: "@gst_plugins_base@/lib/libgstvideo-1.0.dylib",
LIBRARY.VTE: "@vte@/lib/libvte-2.91.dylib",
LIBRARY.PEAS: "@libpeas@/lib/libpeas-1.0.dylib",
LIBRARY.RSVG: "@librsvg@/lib/librsvg-2.dylib",
];
}
else
{
const string[LIBRARY.max+1] importLibs =
[
LIBRARY.ATK: "@atk@/lib/libatk-1.0.so.0",
LIBRARY.CAIRO: "@cairo@/lib/libcairo.so.2",
LIBRARY.GDK: "@gtk3@/lib/libgdk-3.so.0",
LIBRARY.GDKPIXBUF: "@gdk_pixbuf@/lib/libgdk_pixbuf-2.0.so.0",
LIBRARY.GLIB: "@glib@/lib/libglib-2.0.so.0",
LIBRARY.GMODULE: "@glib@/lib/libgmodule-2.0.so.0",
LIBRARY.GOBJECT: "@glib@/lib/libgobject-2.0.so.0",
LIBRARY.GIO: "@glib@/lib/libgio-2.0.so.0",
LIBRARY.GTHREAD: "@glib@/lib/libgthread-2.0.so.0",
LIBRARY.GTK: "@gtk3@/lib/libgtk-3.so.0",
LIBRARY.PANGO: "@pango@/lib/libpango-1.0.so.0",
LIBRARY.PANGOCAIRO: "@pango@/lib/libpangocairo-1.0.so.0",
LIBRARY.GLGDK: "libgdkglext-3.0.so.0",
LIBRARY.GLGTK: "libgtkglext-3.0.so.0",
LIBRARY.GDA: "@libgda@/lib/libgda-4.0.so.4",
LIBRARY.GSV: "@gtksourceview@/lib/libgtksourceview-3.0.so.0",
LIBRARY.GSV1: "@gtksourceview@/lib/libgtksourceview-3.0.so.1",
LIBRARY.GSTREAMER: "@gstreamer@/lib/libgstreamer-1.0.so.0",
LIBRARY.GSTINTERFACES: "@gst_plugins_base@/lib/libgstvideo-1.0.so.0",
LIBRARY.VTE: "@vte@/lib/libvte-2.91.so.0",
LIBRARY.PEAS: "@libpeas@/lib/libpeas-1.0.so.0",
LIBRARY.RSVG: "@librsvg@/lib/librsvg-2.so.2",
];
}

25
pkgs/development/libraries/half/default.nix Normal file
View File

@@ -0,0 +1,25 @@
{ stdenv, fetchzip }:
stdenv.mkDerivation rec {
version = "1.12.0";
name = "half-${version}";
src = fetchzip {
url = "mirror://sourceforge/half/${version}/half-${version}.zip";
sha256 = "0096xiw8nj86vxnn3lfcl94vk9qbi5i8lnydri9ws358ly6002vc";
stripRoot = false;
};
buildCommand = ''
mkdir -p $out/include $out/share/doc
cp $src/include/half.hpp $out/include/
cp $src/{ChangeLog,LICENSE,README}.txt $out/share/doc/
'';
meta = with stdenv.lib; {
description = "C++ library for half precision floating point arithmetics";
platforms = platforms.all;
license = licenses.mit;
maintainers = [ maintainers.volth ];
};
}

4
pkgs/development/libraries/harfbuzz/default.nix
View File

@@ -5,7 +5,7 @@
}:
let
version = "1.4.5";
version = "1.4.6";
inherit (stdenv.lib) optional optionals optionalString;
in
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-${version}.tar.bz2";
sha256 = "d0e05438165884f21658154c709075feaf98c93ee5c694b951533ac425a9a711";
sha256 = "21a78b81cd20cbffdb04b59ac7edfb410e42141869f637ae1d6778e74928d293";
};
outputs = [ "out" "dev" ];

28
pkgs/development/libraries/icu/0001-Disable-LDFLAGSICUDT-for-Linux.patch
View File

@@ -1,28 +0,0 @@
From 0c82d6aa02c08e41b13c83b14782bd7024e25d59 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Sat, 15 Feb 2014 21:06:42 +0000
Subject: [PATCH] Disable LDFLAGSICUDT for Linux
Upstream-Status: Inappropriate [ OE Configuration ]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
source/config/mh-linux | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/source/config/mh-linux b/source/config/mh-linux
index 366f0cc..2689aab 100644
--- a/source/config/mh-linux
+++ b/source/config/mh-linux
@@ -21,7 +21,7 @@ LD_RPATH= -Wl,-zorigin,-rpath,'$$'ORIGIN
LD_RPATH_PRE = -Wl,-rpath,
## These are the library specific LDFLAGS
-LDFLAGSICUDT=-nodefaultlibs -nostdlib
+# LDFLAGSICUDT=-nodefaultlibs -nostdlib
## Compiler switch to embed a library name
# The initial tab in the next line is to prevent icu-config from reading it.
--
1.7.10.4

22
pkgs/development/libraries/icu/default.nix
View File

@@ -12,7 +12,7 @@ let
sha256 = "0hxhpgydalyxacaaxlmaddc1sjwh65rsnpmg0j414mnblq74vmm8";
};
in
stdenv.mkDerivation ({
stdenv.mkDerivation {
name = pname + "-" + version;
src = fetchurl {
@@ -33,21 +33,15 @@ stdenv.mkDerivation ({
echo Source root reset to ''${sourceRoot}
'';
# This pre/postPatch shenanigans is to handle that the patches expect
# to be outside of `source`.
prePatch = ''
pushd ..
'';
postPatch = ''
popd
patch -p4 < ${keywordFix}
'';
patchFlags = "-p4";
patches = [
];
patches = [ keywordFix ];
preConfigure = ''
sed -i -e "s|/bin/sh|${stdenv.shell}|" configure
'' + stdenv.lib.optionalString stdenv.isArm ''
# From https://archlinuxarm.org/packages/armv7h/icu/files/icudata-stdlibs.patch
sed -e 's/LDFLAGSICUDT=-nodefaultlibs -nostdlib/LDFLAGSICUDT=/' -i config/mh-linux
'';
configureFlags = "--disable-debug" +
@@ -68,6 +62,4 @@ stdenv.mkDerivation ({
maintainers = with maintainers; [ raskin ];
platforms = platforms.all;
};
} // (if stdenv.isArm then {
patches = [ ./0001-Disable-LDFLAGSICUDT-for-Linux.patch ];
} else {}))
}

2
pkgs/development/libraries/irrlicht/default.nix
View File

@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
'';
buildPhase = ''
make sharedlib NDEBUG=1
make sharedlib NDEBUG=1 "LDFLAGS=-lX11 -lGL -lXxf86vm"
'';
preInstall = ''

17
pkgs/development/libraries/jasper/default.nix
View File

@@ -1,14 +1,14 @@
{ stdenv, fetchurl, fetchpatch, libjpeg, cmake }:
{ stdenv, fetchFromGitHub, fetchpatch, libjpeg, cmake }:
stdenv.mkDerivation rec {
name = "jasper-2.0.12";
name = "jasper-${version}";
version = "2.0.13";
src = fetchurl {
# You can find this code on Github at https://github.com/mdadams/jasper
# however note at https://www.ece.uvic.ca/~frodo/jasper/#download
# not all tagged releases are for distribution.
url = "http://www.ece.uvic.ca/~mdadams/jasper/software/${name}.tar.gz";
sha256 = "1njdbxv7d4anzrd476wjww2qsi96dd8vfnp4hri0srrqxpszl92v";
src = fetchFromGitHub {
repo = "jasper";
owner = "mdadams";
rev = "version-${version}";
sha256 = "1kd2xiszg9bxfavs3fadi4gi27m876d9zjjy0ns6mmbcjk109c0a";
};
# newer reconf to recognize a multiout flag
@@ -29,5 +29,6 @@ stdenv.mkDerivation rec {
homepage = https://www.ece.uvic.ca/~frodo/jasper/;
description = "JPEG2000 Library";
platforms = platforms.unix;
maintainers = with maintainers; [ pSub ];
};
}

5
pkgs/development/libraries/kde-frameworks/attica.nix
View File

@@ -1,6 +1,6 @@
{ kdeFramework, lib, extra-cmake-modules, qtbase }:
{ mkDerivation, lib, extra-cmake-modules, qtbase }:
kdeFramework {
mkDerivation {
name = "attica";
meta = {
maintainers = [ lib.maintainers.ttuegel ];
@@ -8,4 +8,5 @@ kdeFramework {
};
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ qtbase ];
outputs = [ "out" "dev" ];
}

17
pkgs/development/libraries/kde-frameworks/baloo.nix
View File

@@ -1,14 +1,17 @@
{ kdeFramework, lib, extra-cmake-modules, kauth, kconfig
, kcoreaddons, kcrash, kdbusaddons, kfilemetadata, ki18n, kidletime
, kio, lmdb, qtbase, solid
{
mkDerivation, lib,
extra-cmake-modules,
kauth, kconfig, kcoreaddons, kcrash, kdbusaddons, kfilemetadata, ki18n,
kidletime, kio, lmdb, qtbase, qtdeclarative, solid,
}:
kdeFramework {
mkDerivation {
name = "baloo";
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
nativeBuildInputs = [ extra-cmake-modules ];
propagatedBuildInputs = [
kauth kconfig kcoreaddons kcrash kdbusaddons kfilemetadata ki18n kio
kidletime lmdb qtbase solid
buildInputs = [
kauth kconfig kcrash kdbusaddons ki18n kio kidletime lmdb qtdeclarative
solid
];
propagatedBuildInputs = [ kcoreaddons kfilemetadata qtbase ];
}

9
pkgs/development/libraries/kde-frameworks/bluez-qt.nix
View File

@@ -1,18 +1,19 @@
{ kdeFramework, lib
{ mkDerivation, lib
, extra-cmake-modules
, qtbase, qtdeclarative
}:
kdeFramework {
mkDerivation {
name = "bluez-qt";
meta = {
maintainers = [ lib.maintainers.ttuegel ];
broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
};
nativeBuildInputs = [ extra-cmake-modules ];
propagatedBuildInputs = [ qtdeclarative ];
buildInputs = [ qtdeclarative ];
propagatedBuildInputs = [ qtbase ];
preConfigure = ''
substituteInPlace CMakeLists.txt \
--replace /lib/udev/rules.d "$out/lib/udev/rules.d"
--replace /lib/udev/rules.d "$bin/lib/udev/rules.d"
'';
}

7
pkgs/development/libraries/kde-frameworks/breeze-icons.nix
View File

@@ -1,10 +1,9 @@
{ kdeFramework, lib, extra-cmake-modules, qtsvg }:
{ mkDerivation, lib, extra-cmake-modules, qtsvg }:
kdeFramework {
mkDerivation {
name = "breeze-icons";
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
outputs = [ "out" ];
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ qtsvg ];
propagatedUserEnvPkgs = [ qtsvg.out ];
outputs = [ "out" ]; # only runtime outputs
}

24
pkgs/development/libraries/kde-frameworks/build-support/framework.nix
View File

@@ -1,24 +0,0 @@
{ kdeDerivation, lib, fetchurl }:
let
mirror = "mirror://kde";
srcs = import ../srcs.nix { inherit fetchurl mirror; };
in
args:
let
inherit (args) name;
inherit (srcs."${name}") src version;
in kdeDerivation (args // {
name = "${name}-${version}";
inherit src;
meta = {
license = with lib.licenses; [
lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12
];
platforms = lib.platforms.linux;
homepage = "http://www.kde.org";
} // (args.meta or {});
})

179
pkgs/development/libraries/kde-frameworks/default.nix
View File

@@ -24,89 +24,168 @@ existing packages here and modify it as necessary.
*/
{ libsForQt5, kdeDerivation, lib, fetchurl }:
{ libsForQt5, lib, fetchurl }:
let
srcs = import ./srcs.nix {
inherit fetchurl;
mirror = "mirror://kde";
};
mkDerivation = libsForQt5.callPackage ({ mkDerivation }: mkDerivation) {};
packages = self: with self;
# SUPPORT
let
propagate = out:
let setupHook = { writeScript }:
writeScript "setup-hook" ''
if [ "$hookName" != postHook ]; then
postHooks+=("source @dev@/nix-support/setup-hook")
else
# Propagate $${out} output
propagatedUserEnvPkgs="$propagatedUserEnvPkgs @${out}@"
if [ -z "$outputDev" ]; then
echo "error: \$outputDev is unset!" >&2
exit 1
fi
# Propagate $dev so that this setup hook is propagated
# But only if there is a separate $dev output
if [ "$outputDev" != out ]; then
if [ -n "$crossConfig" ]; then
propagatedBuildInputs="$propagatedBuildInputs @dev@"
else
propagatedNativeBuildInputs="$propagatedNativeBuildInputs @dev@"
fi
fi
fi
'';
in callPackage setupHook {};
propagateBin = propagate "bin";
callPackage = self.newScope {
kdeFramework = import ./build-support/framework.nix {
inherit kdeDerivation lib fetchurl;
};
inherit propagate propagateBin;
mkDerivation = args:
let
inherit (args) name;
inherit (srcs."${name}") src version;
outputs = args.outputs or [ "out" "dev" "bin" ];
hasBin = lib.elem "bin" outputs;
hasDev = lib.elem "dev" outputs;
defaultSetupHook = if hasBin && hasDev then propagateBin else null;
setupHook = args.setupHook or defaultSetupHook;
meta = {
homepage = "http://www.kde.org";
license = with lib.licenses; [
lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12
];
maintainers = [ lib.maintainers.ttuegel ];
platforms = lib.platforms.linux;
} // (args.meta or {});
in mkDerivation (args // {
name = "${name}-${version}";
inherit meta outputs setupHook src;
});
};
in {
extra-cmake-modules = callPackage ./extra-cmake-modules {};
# TIER 1
attica = callPackage ./attica.nix {};
baloo = callPackage ./baloo.nix {};
bluez-qt = callPackage ./bluez-qt.nix {};
breeze-icons = callPackage ./breeze-icons.nix {};
extra-cmake-modules = callPackage ./extra-cmake-modules {};
frameworkintegration = callPackage ./frameworkintegration.nix {};
kactivities = callPackage ./kactivities.nix {};
kactivities-stats = callPackage ./kactivities-stats.nix {};
kapidox = callPackage ./kapidox.nix {};
karchive = callPackage ./karchive.nix {};
kauth = callPackage ./kauth {};
kbookmarks = callPackage ./kbookmarks.nix {};
kcmutils = callPackage ./kcmutils {};
kcodecs = callPackage ./kcodecs.nix {};
kcompletion = callPackage ./kcompletion.nix {};
kconfig = callPackage ./kconfig.nix {};
kconfigwidgets = callPackage ./kconfigwidgets {};
kcoreaddons = callPackage ./kcoreaddons.nix {};
kcrash = callPackage ./kcrash.nix {};
kdbusaddons = callPackage ./kdbusaddons.nix {};
kdeclarative = callPackage ./kdeclarative.nix {};
kded = callPackage ./kded.nix {};
kdelibs4support = callPackage ./kdelibs4support {};
kdesignerplugin = callPackage ./kdesignerplugin.nix {};
kdesu = callPackage ./kdesu.nix {};
kdnssd = callPackage ./kdnssd.nix {};
kdoctools = callPackage ./kdoctools {};
kemoticons = callPackage ./kemoticons.nix {};
kfilemetadata = callPackage ./kfilemetadata {};
kglobalaccel = callPackage ./kglobalaccel.nix {};
kguiaddons = callPackage ./kguiaddons.nix {};
khtml = callPackage ./khtml.nix {};
ki18n = callPackage ./ki18n.nix {};
kiconthemes = callPackage ./kiconthemes {};
kidletime = callPackage ./kidletime.nix {};
kimageformats = callPackage ./kimageformats.nix {};
kinit = callPackage ./kinit {};
kio = callPackage ./kio {};
kitemmodels = callPackage ./kitemmodels.nix {};
kitemviews = callPackage ./kitemviews.nix {};
kjobwidgets = callPackage ./kjobwidgets.nix {};
kjs = callPackage ./kjs.nix {};
kjsembed = callPackage ./kjsembed.nix {};
kmediaplayer = callPackage ./kmediaplayer.nix {};
knewstuff = callPackage ./knewstuff.nix {};
knotifications = callPackage ./knotifications.nix {};
knotifyconfig = callPackage ./knotifyconfig.nix {};
kpackage = callPackage ./kpackage {};
kparts = callPackage ./kparts.nix {};
kpeople = callPackage ./kpeople.nix {};
kplotting = callPackage ./kplotting.nix {};
kpty = callPackage ./kpty.nix {};
kross = callPackage ./kross.nix {};
krunner = callPackage ./krunner.nix {};
kservice = callPackage ./kservice {};
ktexteditor = callPackage ./ktexteditor.nix {};
ktextwidgets = callPackage ./ktextwidgets.nix {};
kunitconversion = callPackage ./kunitconversion.nix {};
kwallet = callPackage ./kwallet.nix {};
kwayland = callPackage ./kwayland.nix {};
kwidgetsaddons = callPackage ./kwidgetsaddons.nix {};
kwindowsystem = callPackage ./kwindowsystem {};
kxmlgui = callPackage ./kxmlgui.nix {};
kxmlrpcclient = callPackage ./kxmlrpcclient.nix {};
modemmanager-qt = callPackage ./modemmanager-qt.nix {};
networkmanager-qt = callPackage ./networkmanager-qt.nix {};
oxygen-icons5 = callPackage ./oxygen-icons5.nix {};
plasma-framework = callPackage ./plasma-framework.nix {};
prison = callPackage ./prison.nix {};
solid = callPackage ./solid.nix {};
sonnet = callPackage ./sonnet.nix {};
syntax-highlighting = callPackage ./syntax-highlighting.nix {};
threadweaver = callPackage ./threadweaver.nix {};
# TIER 2
kactivities = callPackage ./kactivities.nix {};
kactivities-stats = callPackage ./kactivities-stats.nix {};
kauth = callPackage ./kauth {};
kcompletion = callPackage ./kcompletion.nix {};
kcrash = callPackage ./kcrash.nix {};
kdoctools = callPackage ./kdoctools {};
kfilemetadata = callPackage ./kfilemetadata {};
kimageformats = callPackage ./kimageformats.nix {};
kjobwidgets = callPackage ./kjobwidgets.nix {};
knotifications = callPackage ./knotifications.nix {};
kpackage = callPackage ./kpackage {};
kpty = callPackage ./kpty.nix {};
kunitconversion = callPackage ./kunitconversion.nix {};
# TIER 3
baloo = callPackage ./baloo.nix {};
kbookmarks = callPackage ./kbookmarks.nix {};
kcmutils = callPackage ./kcmutils {};
kconfigwidgets = callPackage ./kconfigwidgets {};
kdeclarative = callPackage ./kdeclarative.nix {};
kded = callPackage ./kded.nix {};
kdesignerplugin = callPackage ./kdesignerplugin.nix {};
kdesu = callPackage ./kdesu.nix {};
kemoticons = callPackage ./kemoticons.nix {};
kglobalaccel = callPackage ./kglobalaccel.nix {};
kiconthemes = callPackage ./kiconthemes {};
kinit = callPackage ./kinit {};
kio = callPackage ./kio {};
knewstuff = callPackage ./knewstuff.nix {};
knotifyconfig = callPackage ./knotifyconfig.nix {};
kparts = callPackage ./kparts.nix {};
kpeople = callPackage ./kpeople.nix {};
krunner = callPackage ./krunner.nix {};
kservice = callPackage ./kservice {};
ktexteditor = callPackage ./ktexteditor.nix {};
ktextwidgets = callPackage ./ktextwidgets.nix {};
kwallet = callPackage ./kwallet.nix {};
kxmlgui = callPackage ./kxmlgui.nix {};
kxmlrpcclient = callPackage ./kxmlrpcclient.nix {};
plasma-framework = callPackage ./plasma-framework.nix {};
# TIER 4
frameworkintegration = callPackage ./frameworkintegration.nix {};
# PORTING AIDS
kdelibs4support = callPackage ./kdelibs4support {};
khtml = callPackage ./khtml.nix {};
kjs = callPackage ./kjs.nix {};
kjsembed = callPackage ./kjsembed.nix {};
kmediaplayer = callPackage ./kmediaplayer.nix {};
kross = callPackage ./kross.nix {};
};
in lib.makeScope libsForQt5.newScope packages

4
pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix
View File

@@ -1,6 +1,6 @@
{ kdeFramework, lib, copyPathsToStore, cmake, pkgconfig }:
{ mkDerivation, lib, copyPathsToStore, cmake, pkgconfig }:
kdeFramework {
mkDerivation {
name = "extra-cmake-modules";
patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);

27
pkgs/development/libraries/kde-frameworks/extra-cmake-modules/setup-hook.sh
View File

@@ -1,22 +1,17 @@
_ecmSetXdgDirs() {
_ecmEnvHook() {
addToSearchPath XDG_DATA_DIRS "$1/share"
addToSearchPath XDG_CONFIG_DIRS "$1/etc/xdg"
}
envHooks+=(_ecmEnvHook)
envHooks+=(_ecmSetXdgDirs)
_ecmConfig() {
_ecmPreConfigureHook() {
# Because we need to use absolute paths here, we must set *all* the paths.
cmakeFlags+=" -DKDE_INSTALL_EXECROOTDIR=${!outputBin}"
cmakeFlags+=" -DKDE_INSTALL_BINDIR=${!outputBin}/bin"
cmakeFlags+=" -DKDE_INSTALL_SBINDIR=${!outputBin}/sbin"
cmakeFlags+=" -DKDE_INSTALL_LIBDIR=${!outputLib}/lib"
cmakeFlags+=" -DKDE_INSTALL_LIBEXECDIR=${!outputBin}/lib/libexec"
cmakeFlags+=" -DKDE_INSTALL_LIBEXECDIR=${!outputLib}/lib/libexec"
cmakeFlags+=" -DKDE_INSTALL_CMAKEPACKAGEDIR=${!outputDev}/lib/cmake"
cmakeFlags+=" -DKDE_INSTALL_QTPLUGINDIR=${!outputBin}/lib/qt5/plugins"
cmakeFlags+=" -DKDE_INSTALL_PLUGINDIR=${!outputBin}/lib/qt5/plugins"
cmakeFlags+=" -DKDE_INSTALL_QTQUICKIMPORTSDIR=${!outputBin}/lib/qt5/imports"
cmakeFlags+=" -DKDE_INSTALL_QMLDIR=${!outputBin}/lib/qt5/qml"
cmakeFlags+=" -DKDE_INSTALL_INCLUDEDIR=${!outputInclude}/include"
cmakeFlags+=" -DKDE_INSTALL_LOCALSTATEDIR=/var"
cmakeFlags+=" -DKDE_INSTALL_DATAROOTDIR=${!outputBin}/share"
@@ -29,7 +24,7 @@ _ecmConfig() {
cmakeFlags+=" -DKDE_INSTALL_KXMLGUI5DIR=${!outputBin}/share/kxmlgui5"
cmakeFlags+=" -DKDE_INSTALL_KNOTIFY5RCDIR=${!outputBin}/share/knotifications5"
cmakeFlags+=" -DKDE_INSTALL_ICONDIR=${!outputBin}/share/icons"
cmakeFlags+=" -DKDE_INSTALL_LOCALEDIR=${!outputBin}/share/locale"
cmakeFlags+=" -DKDE_INSTALL_LOCALEDIR=${!outputLib}/share/locale"
cmakeFlags+=" -DKDE_INSTALL_SOUNDDIR=${!outputBin}/share/sounds"
cmakeFlags+=" -DKDE_INSTALL_TEMPLATEDIR=${!outputBin}/share/templates"
cmakeFlags+=" -DKDE_INSTALL_WALLPAPERDIR=${!outputBin}/share/wallpapers"
@@ -46,6 +41,14 @@ _ecmConfig() {
cmakeFlags+=" -DKDE_INSTALL_SYSCONFDIR=${!outputBin}/etc"
cmakeFlags+=" -DKDE_INSTALL_CONFDIR=${!outputBin}/etc/xdg"
cmakeFlags+=" -DKDE_INSTALL_AUTOSTARTDIR=${!outputBin}/etc/xdg/autostart"
}
preConfigureHooks+=(_ecmConfig)
if [ -n "$qtPluginPrefix" ]; then
cmakeFlags+=" -DKDE_INSTALL_QTPLUGINDIR=${!outputBin}/$qtPluginPrefix"
cmakeFlags+=" -DKDE_INSTALL_PLUGINDIR=${!outputBin}/$qtPluginPrefix"
fi
if [ -n "$qtQmlPrefix" ]; then
cmakeFlags+=" -DKDE_INSTALL_QMLDIR=${!outputBin}/$qtQmlPrefix"
fi
}
preConfigureHooks+=(_ecmPreConfigureHook)

2
pkgs/development/libraries/kde-frameworks/fetch.sh
View File

@@ -1 +1 @@
WGET_ARGS=( http://download.kde.org/stable/frameworks/5.33/ -A '*.tar.xz' )
WGET_ARGS=( https://download.kde.org/stable/frameworks/5.34/ -A '*.tar.xz' )

11
pkgs/development/libraries/kde-frameworks/frameworkintegration.nix
View File

@@ -1,16 +1,17 @@
{
kdeFramework, lib,
mkDerivation, lib,
extra-cmake-modules,
kbookmarks, kcompletion, kconfig, kconfigwidgets, ki18n, kiconthemes, kio,
knewstuff, knotifications, kpackage, kwidgetsaddons, libXcursor, qtx11extras
}:
kdeFramework {
mkDerivation {
name = "frameworkintegration";
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
nativeBuildInputs = [ extra-cmake-modules ];
propagatedBuildInputs = [
kbookmarks kcompletion kconfig kconfigwidgets ki18n kio kiconthemes
knewstuff knotifications kpackage kwidgetsaddons libXcursor qtx11extras
buildInputs = [
kbookmarks kcompletion kconfig ki18n kio knewstuff knotifications kpackage
kwidgetsaddons libXcursor qtx11extras
];
propagatedBuildInputs = [ kconfigwidgets kiconthemes ];
}

12
pkgs/development/libraries/kde-frameworks/kactivities-stats.nix
View File

@@ -1,8 +1,14 @@
{ kdeFramework, lib, extra-cmake-modules, boost, kactivities, kconfig }:
{
mkDerivation, lib,
extra-cmake-modules,
boost, kactivities, kconfig, qtbase,
}:
kdeFramework {
mkDerivation {
name = "kactivities-stats";
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
nativeBuildInputs = [ extra-cmake-modules ];
propagatedBuildInputs = [ boost kactivities kconfig ];
buildInputs = [ boost kactivities kconfig ];
propagatedBuildInputs = [ qtbase ];
outputs = [ "out" "dev" ];
}

15
pkgs/development/libraries/kde-frameworks/kactivities.nix
View File

@@ -1,14 +1,15 @@
{ kdeFramework, lib, extra-cmake-modules, boost, kcmutils, kconfig
, kcoreaddons, kdbusaddons, kdeclarative, kglobalaccel, ki18n
, kio, kservice, kwindowsystem, kxmlgui, qtdeclarative
{
mkDerivation, lib,
extra-cmake-modules,
boost, kconfig, kcoreaddons, kio, kwindowsystem, qtbase, qtdeclarative,
}:
kdeFramework {
mkDerivation {
name = "kactivities";
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
nativeBuildInputs = [ extra-cmake-modules ];
propagatedBuildInputs = [
boost kcmutils kconfig kcoreaddons kdbusaddons kdeclarative kglobalaccel
ki18n kio kservice kwindowsystem kxmlgui qtdeclarative
buildInputs = [
boost kconfig kcoreaddons kio kwindowsystem qtdeclarative
];
propagatedBuildInputs = [ qtbase ];
}

7
pkgs/development/libraries/kde-frameworks/kapidox.nix
View File

@@ -1,7 +1,10 @@
{ kdeFramework, lib, extra-cmake-modules, python }:
{ mkDerivation, lib, extra-cmake-modules, python }:
kdeFramework {
mkDerivation {
name = "kapidox";
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
nativeBuildInputs = [ extra-cmake-modules python ];
postFixup = ''
moveToOutput bin $bin
'';
}

12
pkgs/development/libraries/kde-frameworks/karchive.nix
View File

@@ -1,11 +1,17 @@
{ kdeFramework, lib, extra-cmake-modules, qtbase }:
{
mkDerivation, lib,
extra-cmake-modules,
bzip2, lzma, qtbase, zlib,
}:
kdeFramework {
mkDerivation {
name = "karchive";
meta = {
maintainers = [ lib.maintainers.ttuegel ];
broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
};
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ qtbase ];
buildInputs = [ bzip2 lzma zlib ];
propagatedBuildInputs = [ qtbase ];
outputs = [ "out" "dev" ];
}

16
pkgs/development/libraries/kde-frameworks/kauth/default.nix
View File

@@ -1,9 +1,17 @@
{ kdeFramework, lib, copyPathsToStore, extra-cmake-modules, kcoreaddons, polkit-qt, qttools }:
{
mkDerivation, lib, copyPathsToStore, propagate,
extra-cmake-modules, kcoreaddons, polkit-qt, qttools
}:
kdeFramework {
mkDerivation {
name = "kauth";
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
nativeBuildInputs = [ extra-cmake-modules qttools ];
propagatedBuildInputs = [ kcoreaddons polkit-qt ];
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ polkit-qt qttools ];
propagatedBuildInputs = [ kcoreaddons ];
patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
# library stores reference to plugin path,
# separating $out from $bin would create a reference cycle
outputs = [ "out" "dev" ];
setupHook = propagate "out";
}

14
pkgs/development/libraries/kde-frameworks/kbookmarks.nix
View File

@@ -1,13 +1,17 @@
{
kdeFramework, lib, extra-cmake-modules,
kcodecs, kconfig, kconfigwidgets, kcoreaddons, kiconthemes, kxmlgui
mkDerivation, lib,
extra-cmake-modules, qttools,
kcodecs, kconfig, kconfigwidgets, kcoreaddons, kiconthemes, kwidgetsaddons,
kxmlgui, qtbase,
}:
kdeFramework {
mkDerivation {
name = "kbookmarks";
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
nativeBuildInputs = [ extra-cmake-modules ];
propagatedBuildInputs = [
nativeBuildInputs = [ extra-cmake-modules qttools ];
buildInputs = [
kcodecs kconfig kconfigwidgets kcoreaddons kiconthemes kxmlgui
];
propagatedBuildInputs = [ kwidgetsaddons qtbase ];
outputs = [ "out" "dev" ];
}

19
pkgs/development/libraries/kde-frameworks/kcmutils/default.nix
View File

@@ -1,15 +1,18 @@
{ kdeFramework, lib, extra-cmake-modules, kconfigwidgets
, kcoreaddons, kdeclarative, ki18n, kiconthemes, kitemviews
, kpackage, kservice, kxmlgui
{
mkDerivation, lib, copyPathsToStore,
extra-cmake-modules,
kconfigwidgets, kcoreaddons, kdeclarative, ki18n, kiconthemes, kitemviews,
kpackage, kservice, kxmlgui, qtdeclarative,
}:
kdeFramework {
mkDerivation {
name = "kcmutils";
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
nativeBuildInputs = [ extra-cmake-modules ];
propagatedBuildInputs = [
kconfigwidgets kcoreaddons kdeclarative ki18n kiconthemes kitemviews
kpackage kservice kxmlgui
buildInputs = [
kcoreaddons kdeclarative ki18n kiconthemes kitemviews kpackage kxmlgui
qtdeclarative
];
patches = [ ./0001-qdiriterator-follow-symlinks.patch ];
propagatedBuildInputs = [ kconfigwidgets kservice ];
patches = (copyPathsToStore (lib.readPathsFromFile ./. ./series));
}

13
pkgs/development/libraries/kde-frameworks/kcmutils/kcmutils-debug-module-loader.patch Normal file
View File

@@ -0,0 +1,13 @@
Index: kcmutils-5.33.0/src/kcmoduleloader.cpp
===================================================================
--- kcmutils-5.33.0.orig/src/kcmoduleloader.cpp
+++ kcmutils-5.33.0/src/kcmoduleloader.cpp
@@ -96,7 +96,7 @@ KCModule *KCModuleLoader::loadModule(con
KPluginLoader loader(KPluginLoader::findPlugin(QLatin1String("kcms/") + mod.service()->library()));
KPluginFactory* factory = loader.factory();
if (!factory) {
- qWarning() << "Error loading plugin:" << loader.errorString();
+ qWarning() << "Error loading KCM plugin" << mod.service()->library() << loader.errorString();
} else {
KQuickAddons::ConfigModule *cm = factory->create<KQuickAddons::ConfigModule >();
if (!cm) {

13
pkgs/development/libraries/kde-frameworks/kcmutils/kcmutils-fix-plugin-path.patch Normal file
View File

@@ -0,0 +1,13 @@
Index: kcmutils-5.33.0/src/kcmoduleloader.cpp
===================================================================
--- kcmutils-5.33.0.orig/src/kcmoduleloader.cpp
+++ kcmutils-5.33.0/src/kcmoduleloader.cpp
@@ -93,7 +93,7 @@ KCModule *KCModuleLoader::loadModule(con
if (module) {
return module;
} else {
- KPluginLoader loader(KPluginLoader::findPlugin(QLatin1String("kcms/") + mod.service()->library()));
+ KPluginLoader loader(KPluginLoader::findPlugin(mod.service()->library()));
KPluginFactory* factory = loader.factory();
if (!factory) {
qWarning() << "Error loading KCM plugin" << mod.service()->library() << loader.errorString();

22
pkgs/development/libraries/kde-frameworks/kcmutils/0001-qdiriterator-follow-symlinks.patch → pkgs/development/libraries/kde-frameworks/kcmutils/kcmutils-follow-symlinks.patch
View File

@@ -1,17 +1,8 @@
From f14d2a275323a47104b33eb61c5b6910ae1a9f59 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Wed, 14 Oct 2015 06:43:53 -0500
Subject: [PATCH] qdiriterator follow symlinks
---
src/kpluginselector.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/kpluginselector.cpp b/src/kpluginselector.cpp
index 9c3431d..d6b1ee2 100644
--- a/src/kpluginselector.cpp
+++ b/src/kpluginselector.cpp
@@ -305,7 +305,7 @@ void KPluginSelector::addPlugins(const QString &componentName,
Index: kcmutils-5.33.0/src/kpluginselector.cpp
===================================================================
--- kcmutils-5.33.0.orig/src/kpluginselector.cpp
+++ kcmutils-5.33.0/src/kpluginselector.cpp
@@ -305,7 +305,7 @@ void KPluginSelector::addPlugins(const Q
QStringList desktopFileNames;
const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, componentName + QStringLiteral("/kpartplugins"), QStandardPaths::LocateDirectory);
Q_FOREACH (const QString &dir, dirs) {
@@ -20,6 +11,3 @@ index 9c3431d..d6b1ee2 100644
while (it.hasNext()) {
desktopFileNames.append(it.next());
}
--
2.5.2

3
pkgs/development/libraries/kde-frameworks/kcmutils/series Normal file
View File

@@ -0,0 +1,3 @@
kcmutils-follow-symlinks.patch
kcmutils-debug-module-loader.patch
kcmutils-fix-plugin-path.patch

10
pkgs/development/libraries/kde-frameworks/kcodecs.nix
View File

@@ -1,11 +1,13 @@
{ kdeFramework, lib, extra-cmake-modules, qtbase, qttools }:
{ mkDerivation, lib, extra-cmake-modules, qtbase, qttools }:
kdeFramework {
mkDerivation {
name = "kcodecs";
meta = {
maintainers = [ lib.maintainers.ttuegel ];
broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
};
nativeBuildInputs = [ extra-cmake-modules qttools ];
buildInputs = [ qtbase ];
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ qttools ];
propagatedBuildInputs = [ qtbase ];
outputs = [ "out" "dev" ];
}

15
pkgs/development/libraries/kde-frameworks/kcompletion.nix
View File

@@ -1,9 +1,14 @@
{ kdeFramework, lib, extra-cmake-modules, kconfig, kwidgetsaddons, qtbase, qttools }:
{
mkDerivation, lib,
extra-cmake-modules,
kconfig, kwidgetsaddons, qtbase, qttools
}:
kdeFramework {
mkDerivation {
name = "kcompletion";
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
nativeBuildInputs = [ extra-cmake-modules qttools ];
buildInputs = [ qtbase ];
propagatedBuildInputs = [ kconfig kwidgetsaddons ];
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ kconfig kwidgetsaddons qttools ];
propagatedBuildInputs = [ qtbase ];
outputs = [ "out" "dev" ];
}

9
pkgs/development/libraries/kde-frameworks/kconfig.nix
View File

@@ -1,11 +1,12 @@
{ kdeFramework, lib, extra-cmake-modules, qtbase, qttools }:
{ mkDerivation, lib, extra-cmake-modules, qtbase, qttools }:
kdeFramework {
mkDerivation {
name = "kconfig";
meta = {
maintainers = [ lib.maintainers.ttuegel ];
broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
};
nativeBuildInputs = [ extra-cmake-modules qttools ];
buildInputs = [ qtbase ];
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ qttools ];
propagatedBuildInputs = [ qtbase ];
}

17
pkgs/development/libraries/kde-frameworks/kconfigwidgets/default.nix
View File

@@ -1,17 +1,20 @@
{
kdeFramework, lib, extra-cmake-modules,
kauth, kcodecs, kconfig, kdoctools, kguiaddons, ki18n, kwidgetsaddons
mkDerivation, lib, extra-cmake-modules,
kauth, kcodecs, kconfig, kdoctools, kguiaddons, ki18n, kwidgetsaddons, qtbase,
}:
kdeFramework {
mkDerivation {
name = "kconfigwidgets";
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
propagatedBuildInputs = [
kauth kconfig kcodecs kguiaddons ki18n kwidgetsaddons
];
buildInputs = [ kguiaddons ki18n qtbase ];
propagatedBuildInputs = [ kauth kcodecs kconfig kwidgetsaddons ];
patches = [ ./0001-qdiriterator-follow-symlinks.patch ];
outputs = [ "out" "dev" ];
preConfigure = ''
outputBin=dev
'';
postInstall = ''
moveToOutput "bin/preparetips5" "$dev"
moveToOutput share/man $dev
'';
}

14
pkgs/development/libraries/kde-frameworks/kcoreaddons.nix
View File

@@ -1,12 +1,16 @@
{ kdeFramework, lib, fetchurl, extra-cmake-modules, qtbase, qttools, shared_mime_info }:
{
mkDerivation, lib, fetchurl, writeScript,
extra-cmake-modules,
qtbase, qttools, shared_mime_info
}:
kdeFramework {
mkDerivation {
name = "kcoreaddons";
meta = {
maintainers = [ lib.maintainers.ttuegel ];
broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
};
nativeBuildInputs = [ extra-cmake-modules qttools ];
buildInputs = [ qtbase ];
propagatedBuildInputs = [ shared_mime_info ];
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ qttools shared_mime_info ];
propagatedBuildInputs = [ qtbase ];
}

12
pkgs/development/libraries/kde-frameworks/kcrash.nix
View File

@@ -1,8 +1,14 @@
{ kdeFramework, lib, extra-cmake-modules, kcoreaddons, kwindowsystem, qtx11extras }:
{
mkDerivation, lib,
extra-cmake-modules,
kcoreaddons, kwindowsystem, qtbase, qtx11extras,
}:
kdeFramework {
mkDerivation {
name = "kcrash";
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
nativeBuildInputs = [ extra-cmake-modules ];
propagatedBuildInputs = [ kcoreaddons kwindowsystem qtx11extras ];
buildInputs = [ kcoreaddons kwindowsystem qtx11extras ];
propagatedBuildInputs = [ qtbase ];
outputs = [ "out" "dev" ];
}

13
pkgs/development/libraries/kde-frameworks/kdbusaddons.nix
View File

@@ -1,11 +1,16 @@
{ kdeFramework, lib, extra-cmake-modules, qtbase, qttools, qtx11extras }:
{
mkDerivation, lib,
extra-cmake-modules,
qtbase, qttools, qtx11extras
}:
kdeFramework {
mkDerivation {
name = "kdbusaddons";
meta = {
maintainers = [ lib.maintainers.ttuegel ];
broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
};
nativeBuildInputs = [ extra-cmake-modules qttools ];
propagatedBuildInputs = [ qtx11extras ];
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ qttools qtx11extras ];
propagatedBuildInputs = [ qtbase ];
}

11
pkgs/development/libraries/kde-frameworks/kdeclarative.nix
View File

@@ -1,15 +1,16 @@
{
kdeFramework, lib, extra-cmake-modules,
mkDerivation, lib, extra-cmake-modules,
epoxy, kconfig, kglobalaccel, kguiaddons, ki18n, kiconthemes, kio, kpackage,
kwidgetsaddons, kwindowsystem, pkgconfig, qtdeclarative
}:
kdeFramework {
mkDerivation {
name = "kdeclarative";
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
nativeBuildInputs = [ extra-cmake-modules ];
propagatedBuildInputs = [
epoxy kconfig kglobalaccel kguiaddons ki18n kiconthemes kio kpackage
kwidgetsaddons kwindowsystem qtdeclarative
buildInputs = [
epoxy kglobalaccel kguiaddons ki18n kiconthemes kio kwidgetsaddons
kwindowsystem
];
propagatedBuildInputs = [ kconfig kpackage qtdeclarative ];
}

13
pkgs/development/libraries/kde-frameworks/kded.nix
View File

@@ -1,13 +1,16 @@
{
kdeFramework, lib, extra-cmake-modules,
kconfig, kcoreaddons, kcrash, kdbusaddons, kdoctools, kinit, kservice
mkDerivation, lib, propagate,
extra-cmake-modules, kdoctools,
kconfig, kcoreaddons, kcrash, kdbusaddons, kinit, kservice, qtbase,
}:
kdeFramework {
mkDerivation {
name = "kded";
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
propagatedBuildInputs = [
kconfig kcoreaddons kcrash kdbusaddons kinit kservice
buildInputs = [
kconfig kcoreaddons kcrash kdbusaddons kinit kservice qtbase
];
outputs = [ "out" "dev" ];
setupHook = propagate "out";
}

36
pkgs/development/libraries/kde-frameworks/kdelibs4support/default.nix
View File

@@ -1,30 +1,32 @@
{ kdeFramework, lib, copyPathsToStore
, extra-cmake-modules, docbook_xml_dtd_45, kauth
, karchive, kcompletion, kconfig, kconfigwidgets, kcoreaddons
, kcrash, kdbusaddons, kded, kdesignerplugin, kdoctools, kemoticons
, kglobalaccel, kguiaddons, ki18n, kiconthemes, kio, kitemmodels
, kinit, knotifications, kparts, kservice, ktextwidgets
, kunitconversion, kwidgetsaddons, kwindowsystem, kxmlgui
, networkmanager, qtsvg, qtx11extras, xlibs
{
mkDerivation, lib, copyPathsToStore,
docbook_xml_dtd_45, extra-cmake-modules, kdoctools,
kauth, karchive, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kcrash,
kdbusaddons, kded, kdesignerplugin, kemoticons, kglobalaccel, kguiaddons,
ki18n, kiconthemes, kio, kitemmodels, kinit, knotifications, kparts, kservice,
ktextwidgets, kunitconversion, kwidgetsaddons, kwindowsystem, kxmlgui,
networkmanager, qtbase, qtsvg, qttools, qtx11extras, xlibs
}:
# TODO: debug docbook detection
kdeFramework {
mkDerivation {
name = "kdelibs4support";
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
setupHook = ./setup-hook.sh;
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
nativeBuildInputs = [ extra-cmake-modules qttools ];
propagatedNativeBuildInputs = [ kdoctools ];
buildInputs = [
kcompletion kconfig kded kglobalaccel ki18n kio kservice kwidgetsaddons
kxmlgui networkmanager qtsvg qtx11extras xlibs.libSM
];
propagatedBuildInputs = [
kauth karchive kcompletion kconfig kconfigwidgets kcoreaddons kcrash
kdbusaddons kded kdesignerplugin kemoticons kglobalaccel kguiaddons ki18n
kio kiconthemes kitemmodels kinit knotifications kparts kservice
ktextwidgets kunitconversion kwidgetsaddons kwindowsystem kxmlgui
networkmanager qtsvg qtx11extras xlibs.libSM
kauth karchive kconfigwidgets kcoreaddons kcrash kdbusaddons kdesignerplugin
kemoticons kguiaddons kiconthemes kitemmodels kinit knotifications kparts
ktextwidgets kunitconversion kwindowsystem qtbase
];
cmakeFlags = [
"-DDocBookXML4_DTD_DIR=${docbook_xml_dtd_45}/xml/dtd/docbook"
"-DDocBookXML4_DTD_VERSION=4.5"
];
outputs = [ "out" "dev" ];
}

28
pkgs/development/libraries/kde-frameworks/kdesignerplugin.nix
View File

@@ -1,26 +1,16 @@
{ kdeFramework, lib
, extra-cmake-modules
, kcompletion
, kconfig
, kconfigwidgets
, kcoreaddons
, kdoctools
, kiconthemes
, kio
, kitemviews
, kplotting
, ktextwidgets
, kwidgetsaddons
, kxmlgui
, sonnet
{
mkDerivation, lib,
extra-cmake-modules, kdoctools,
kcompletion, kconfig, kconfigwidgets, kcoreaddons, kiconthemes, kio,
kitemviews, kplotting, ktextwidgets, kwidgetsaddons, kxmlgui, qttools, sonnet,
}:
kdeFramework {
mkDerivation {
name = "kdesignerplugin";
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
propagatedBuildInputs = [
kcompletion kconfig kconfigwidgets kcoreaddons kiconthemes kio
kitemviews kplotting ktextwidgets kwidgetsaddons kxmlgui sonnet
buildInputs = [
kcompletion kconfig kconfigwidgets kcoreaddons kiconthemes kio kitemviews
kplotting ktextwidgets kwidgetsaddons kxmlgui qttools sonnet
];
}

12
pkgs/development/libraries/kde-frameworks/kdesu.nix
View File

@@ -1,10 +1,14 @@
{ kdeFramework, lib, extra-cmake-modules, kcoreaddons, ki18n, kpty
, kservice
{
mkDerivation, lib,
extra-cmake-modules,
kcoreaddons, ki18n, kpty, kservice, qtbase,
}:
kdeFramework {
mkDerivation {
name = "kdesu";
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
nativeBuildInputs = [ extra-cmake-modules ];
propagatedBuildInputs = [ kcoreaddons ki18n kpty kservice ];
buildInputs = [ kcoreaddons ki18n kpty kservice qtbase ];
propagatedBuildInputs = [ kpty ];
outputs = [ "out" "dev" ];
}

16
pkgs/development/libraries/kde-frameworks/kdnssd.nix
View File

@@ -1,15 +1,17 @@
{ kdeFramework, lib
, extra-cmake-modules, qttools
, avahi, qtbase
{
mkDerivation, lib,
extra-cmake-modules,
avahi, qtbase, qttools,
}:
kdeFramework {
mkDerivation {
name = "kdnssd";
meta = {
maintainers = [ lib.maintainers.ttuegel ];
broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
};
nativeBuildInputs = [ extra-cmake-modules qttools ];
propagatedBuildInputs = [ avahi ];
buildInputs = [ qtbase ];
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ avahi qttools ];
propagatedBuildInputs = [ qtbase ];
outputs = [ "out" "dev" ];
}

22
pkgs/development/libraries/kde-frameworks/kdoctools/default.nix
View File

@@ -1,16 +1,28 @@
{ kdeFramework, lib, extra-cmake-modules, docbook_xml_dtd_45
, docbook5_xsl, karchive, ki18n, perl, perlPackages
{
mkDerivation, lib,
extra-cmake-modules, docbook_xml_dtd_45, docbook5_xsl,
karchive, ki18n, qtbase,
perl, perlPackages
}:
kdeFramework {
mkDerivation {
name = "kdoctools";
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
nativeBuildInputs = [ extra-cmake-modules ];
propagatedBuildInputs = [ karchive ki18n ];
propagatedNativeBuildInputs = [ perl perlPackages.URI ];
buildInputs = [ karchive ki18n ];
propagatedBuildInputs = [ qtbase ];
outputs = [ "out" "dev" ];
patches = [ ./kdoctools-no-find-docbook-xml.patch ];
preConfigure = ''
outputBin=dev
'';
cmakeFlags = [
"-DDocBookXML4_DTD_DIR=${docbook_xml_dtd_45}/xml/dtd/docbook"
"-DDocBookXSL_DIR=${docbook5_xsl}/xml/xsl/docbook"
];
patches = [ ./kdoctools-no-find-docbook-xml.patch ];
postFixup = ''
moveToOutput "share/doc" "$dev"
moveToOutput "share/man" "$dev"
'';
}

15
pkgs/development/libraries/kde-frameworks/kemoticons.nix
View File

@@ -1,14 +1,13 @@
{ kdeFramework, lib
, extra-cmake-modules
, karchive
, kconfig
, kcoreaddons
, kservice
{
mkDerivation, lib,
extra-cmake-modules,
karchive, kcoreaddons, kservice, qtbase,
}:
kdeFramework {
mkDerivation {
name = "kemoticons";
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
nativeBuildInputs = [ extra-cmake-modules ];
propagatedBuildInputs = [ karchive kconfig kcoreaddons kservice ];
buildInputs = [ karchive kcoreaddons ];
propagatedBuildInputs = [ kservice qtbase ];
}

15
pkgs/development/libraries/kde-frameworks/kfilemetadata/default.nix
View File

@@ -1,13 +1,16 @@
{ kdeFramework, lib, copyPathsToStore, extra-cmake-modules
, attr, ebook_tools, exiv2, ffmpeg, karchive, ki18n, poppler, qtbase, taglib
{
mkDerivation, lib, copyPathsToStore,
extra-cmake-modules,
attr, ebook_tools, exiv2, ffmpeg, karchive, ki18n, poppler, qtbase, taglib
}:
kdeFramework {
mkDerivation {
name = "kfilemetadata";
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
nativeBuildInputs = [ extra-cmake-modules ];
propagatedBuildInputs = [
attr ebook_tools exiv2 ffmpeg karchive ki18n poppler qtbase taglib
buildInputs = [
attr ebook_tools exiv2 ffmpeg karchive ki18n poppler taglib
];
propagatedBuildInputs = [ qtbase ];
patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
}

18
pkgs/development/libraries/kde-frameworks/kglobalaccel.nix
View File

@@ -1,14 +1,20 @@
{
kdeFramework, lib, extra-cmake-modules,
mkDerivation, lib,
extra-cmake-modules,
kconfig, kcoreaddons, kcrash, kdbusaddons, kservice, kwindowsystem,
qtx11extras
qtbase, qttools, qtx11extras,
}:
kdeFramework {
mkDerivation {
name = "kglobalaccel";
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
nativeBuildInputs = [ extra-cmake-modules ];
propagatedBuildInputs = [
kconfig kcoreaddons kcrash kdbusaddons kservice kwindowsystem qtx11extras
buildInputs = [
kconfig kcoreaddons kcrash kdbusaddons kservice kwindowsystem qttools
qtx11extras
];
propagatedBuildInputs = [ qtbase ];
postPatch = ''
sed -i src/runtime/org.kde.kglobalaccel.service.in \
-e "s|@CMAKE_INSTALL_PREFIX@|''${!outputBin}|"
'';
}

8
pkgs/development/libraries/kde-frameworks/kguiaddons.nix
View File

@@ -1,15 +1,17 @@
{
kdeFramework, lib,
mkDerivation, lib,
extra-cmake-modules,
qtbase, qtx11extras,
}:
kdeFramework {
mkDerivation {
name = "kguiaddons";
meta = {
maintainers = [ lib.maintainers.ttuegel ];
broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
};
nativeBuildInputs = [ extra-cmake-modules ];
propagatedBuildInputs = [ qtx11extras ];
buildInputs = [ qtx11extras ];
propagatedBuildInputs = [ qtbase ];
outputs = [ "out" "dev" ];
}

21
pkgs/development/libraries/kde-frameworks/khtml.nix
View File

@@ -1,16 +1,19 @@
{ kdeFramework, lib, extra-cmake-modules, giflib, karchive
, kcodecs, kglobalaccel, ki18n, kiconthemes, kio, kjs
, knotifications, kparts, ktextwidgets, kwallet, kwidgetsaddons
, kwindowsystem, kxmlgui, perl, phonon, qtx11extras, sonnet
{
mkDerivation, lib,
extra-cmake-modules, perl,
giflib, karchive, kcodecs, kglobalaccel, ki18n, kiconthemes, kio, kjs,
knotifications, kparts, ktextwidgets, kwallet, kwidgetsaddons, kwindowsystem,
kxmlgui, phonon, qtx11extras, sonnet
}:
kdeFramework {
mkDerivation {
name = "khtml";
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
nativeBuildInputs = [ extra-cmake-modules perl ];
propagatedBuildInputs = [
giflib karchive kcodecs kglobalaccel ki18n kiconthemes kio kjs
knotifications kparts ktextwidgets kwallet kwidgetsaddons kwindowsystem
kxmlgui phonon qtx11extras sonnet
buildInputs = [
giflib karchive kcodecs kglobalaccel ki18n kiconthemes kio knotifications
kparts ktextwidgets kwallet kwidgetsaddons kwindowsystem kxmlgui phonon
qtx11extras sonnet
];
propagatedBuildInputs = [ kjs ];
}

6
pkgs/development/libraries/kde-frameworks/ki18n.nix
View File

@@ -1,10 +1,10 @@
{
kdeFramework, lib,
mkDerivation, lib,
extra-cmake-modules, gettext, python,
qtbase, qtdeclarative, qtscript,
}:
kdeFramework {
mkDerivation {
name = "ki18n";
meta = {
maintainers = [ lib.maintainers.ttuegel ];
@@ -12,5 +12,5 @@ kdeFramework {
};
nativeBuildInputs = [ extra-cmake-modules ];
propagatedNativeBuildInputs = [ gettext python ];
propagatedBuildInputs = [ qtdeclarative qtscript ];
buildInputs = [ qtdeclarative qtscript ];
}

15
pkgs/development/libraries/kde-frameworks/kiconthemes/default.nix
View File

@@ -1,12 +1,17 @@
{ kdeFramework, lib, copyPathsToStore
, extra-cmake-modules
, karchive, kconfigwidgets, ki18n, breeze-icons, kitemviews, qtsvg
{
mkDerivation, lib, copyPathsToStore,
extra-cmake-modules,
breeze-icons, karchive, kcoreaddons, kconfigwidgets, ki18n, kitemviews,
qtbase, qtsvg,
}:
kdeFramework {
mkDerivation {
name = "kiconthemes";
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
nativeBuildInputs = [ extra-cmake-modules ];
propagatedBuildInputs = [ breeze-icons kconfigwidgets karchive ki18n kitemviews qtsvg ];
buildInputs = [
breeze-icons karchive kcoreaddons kconfigwidgets ki18n kitemviews
];
propagatedBuildInputs = [ qtbase qtsvg ];
}

13
pkgs/development/libraries/kde-frameworks/kidletime.nix
View File

@@ -1,15 +1,16 @@
{ kdeFramework, lib
, extra-cmake-modules
, qtbase
, qtx11extras
{
mkDerivation, lib,
extra-cmake-modules,
qtbase, qtx11extras
}:
kdeFramework {
mkDerivation {
name = "kidletime";
meta = {
maintainers = [ lib.maintainers.ttuegel ];
broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
};
nativeBuildInputs = [ extra-cmake-modules ];
propagatedBuildInputs = [ qtbase qtx11extras ];
buildInputs = [ qtx11extras ];
propagatedBuildInputs = [ qtbase ];
}

14
pkgs/development/libraries/kde-frameworks/kimageformats.nix
View File

@@ -1,14 +1,16 @@
{
kdeFramework, lib,
mkDerivation, lib,
extra-cmake-modules,
ilmbase, karchive, qtbase
ilmbase, karchive, openexr, qtbase
}:
kdeFramework {
let inherit (lib) getDev; in
mkDerivation {
name = "kimageformats";
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ ilmbase qtbase ];
propagatedBuildInputs = [ karchive ];
NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR";
buildInputs = [ karchive openexr qtbase ];
outputs = [ "out" ]; # plugins only
NIX_CFLAGS_COMPILE = "-I${getDev ilmbase}/include/OpenEXR";
}

25
pkgs/development/libraries/kde-frameworks/kinit/default.nix
View File

@@ -1,17 +1,16 @@
{
kdeFramework, lib, copyPathsToStore,
mkDerivation, lib, copyPathsToStore, writeScript,
extra-cmake-modules, kdoctools,
kconfig, kcrash, ki18n, kio, kparts, kservice, kwindowsystem, plasma-framework
}:
let
inherit (lib) getLib;
in
kdeFramework {
let inherit (lib) getLib; in
mkDerivation {
name = "kinit";
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
propagatedBuildInputs = [
buildInputs = [
kconfig kcrash ki18n kio kservice kwindowsystem
];
patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
@@ -20,4 +19,18 @@ kdeFramework {
''-DNIXPKGS_KF5_PARTS="${getLib kparts}/lib/libKF5Parts.so.5"''
''-DNIXPKGS_KF5_PLASMA="${getLib plasma-framework}/lib/libKF5Plasma.so.5"''
];
postFixup = ''
moveToOutput "lib/libexec/kf5/start_kdeinit" "$bin"
'';
setupHook = writeScript "setup-hook.sh" ''
kinitFixupOutputHook() {
if [ $prefix != ''${!outputBin} ] && [ -d $prefix/lib ]; then
mkdir -p ''${!outputBin}/lib
find $prefix/lib -maxdepth 1 -name 'libkdeinit5_*.so' -exec ln -s \{\} ''${!outputBin}/lib \;
rmdir --ignore-fail-on-non-empty ''${!outputBin}/lib
fi
}
fixupOutputHooks+=(kinitFixupOutputHook)
'';
}

26
pkgs/development/libraries/kde-frameworks/kio/default.nix
View File

@@ -1,21 +1,23 @@
{ kdeFramework, lib, copyPathsToStore
, extra-cmake-modules, acl, karchive
, kbookmarks, kcompletion, kconfig, kconfigwidgets, kcoreaddons
, kdbusaddons, kdoctools, ki18n, kiconthemes, kitemviews
, kjobwidgets, knotifications, kservice, ktextwidgets, kwallet
, kwidgetsaddons, kwindowsystem, kxmlgui
, qtscript, qtx11extras, solid, fetchpatch
{
mkDerivation, lib, copyPathsToStore,
extra-cmake-modules, kdoctools,
karchive, kbookmarks, kcompletion, kconfig, kconfigwidgets, kcoreaddons,
kdbusaddons, ki18n, kiconthemes, kitemviews, kjobwidgets, knotifications,
kservice, ktextwidgets, kwallet, kwidgetsaddons, kwindowsystem, kxmlgui,
qtbase, qtscript, qtx11extras, solid,
}:
kdeFramework {
mkDerivation {
name = "kio";
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
karchive kconfigwidgets kdbusaddons ki18n kiconthemes knotifications
ktextwidgets kwallet kwidgetsaddons kwindowsystem qtscript qtx11extras
];
propagatedBuildInputs = [
acl karchive kbookmarks kcompletion kconfig kconfigwidgets kcoreaddons
kdbusaddons ki18n kiconthemes kitemviews kjobwidgets knotifications kservice
ktextwidgets kwallet kwidgetsaddons kwindowsystem kxmlgui solid qtscript
qtx11extras
kbookmarks kcompletion kconfig kcoreaddons kitemviews kjobwidgets kservice
kxmlgui qtbase solid
];
patches = (copyPathsToStore (lib.readPathsFromFile ./. ./series));
}

13
pkgs/development/libraries/kde-frameworks/kio/kio-debug-module-loader.patch Normal file
View File

@@ -0,0 +1,13 @@
Index: kio-5.33.0/src/kiod/kiod_main.cpp
===================================================================
--- kio-5.33.0.orig/src/kiod/kiod_main.cpp
+++ kio-5.33.0/src/kiod/kiod_main.cpp
@@ -60,7 +60,7 @@ void KIOD::loadModule(const QString &nam
module = factory->create<KDEDModule>();
}
if (!module) {
- qCWarning(KIOD_CATEGORY) << "Error loading plugin:" << loader.errorString();
+ qCWarning(KIOD_CATEGORY) << "Error loading plugin" << name << loader.errorString();
return;
}
module->setModuleName(name); // makes it register to DBus

1
pkgs/development/libraries/kde-frameworks/kio/series
View File

@@ -1 +1,2 @@
samba-search-path.patch
kio-debug-module-loader.patch

11
pkgs/development/libraries/kde-frameworks/kitemmodels.nix
View File

@@ -1,13 +1,16 @@
{ kdeFramework, lib
, extra-cmake-modules, qtbase
{
mkDerivation, lib,
extra-cmake-modules,
qtbase
}:
kdeFramework {
mkDerivation {
name = "kitemmodels";
meta = {
maintainers = [ lib.maintainers.ttuegel ];
broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
};
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ qtbase ];
propagatedBuildInputs = [ qtbase ];
outputs = [ "out" "dev" ];
}

14
pkgs/development/libraries/kde-frameworks/kitemviews.nix
View File

@@ -1,13 +1,17 @@
{ kdeFramework, lib
, extra-cmake-modules, qtbase, qttools
{
mkDerivation, lib,
extra-cmake-modules,
qtbase, qttools
}:
kdeFramework {
mkDerivation {
name = "kitemviews";
meta = {
maintainers = [ lib.maintainers.ttuegel ];
broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
};
nativeBuildInputs = [ extra-cmake-modules qttools ];
buildInputs = [ qtbase ];
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ qttools ];
propagatedBuildInputs = [ qtbase ];
outputs = [ "out" "dev" ];
}

13
pkgs/development/libraries/kde-frameworks/kjobwidgets.nix
View File

@@ -1,13 +1,12 @@
{ kdeFramework, lib
, extra-cmake-modules
, kcoreaddons
, kwidgetsaddons
, qttools, qtx11extras
{
mkDerivation, lib,
extra-cmake-modules, qttools,
kcoreaddons, kwidgetsaddons, qtx11extras
}:
kdeFramework {
mkDerivation {
name = "kjobwidgets";
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
nativeBuildInputs = [ extra-cmake-modules qttools ];
propagatedBuildInputs = [ kcoreaddons kwidgetsaddons qtx11extras ];
buildInputs = [ kcoreaddons kwidgetsaddons qtx11extras ];
}

10
pkgs/development/libraries/kde-frameworks/kjs.nix
View File

@@ -1,10 +1,12 @@
{ kdeFramework, lib
, extra-cmake-modules
, kdoctools
{
mkDerivation, lib,
extra-cmake-modules, kdoctools,
pcre, qtbase,
}:
kdeFramework {
mkDerivation {
name = "kjs";
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [ pcre qtbase ];
}

13
pkgs/development/libraries/kde-frameworks/kjsembed.nix
View File

@@ -1,10 +1,13 @@
{ kdeFramework, lib, extra-cmake-modules, kdoctools, ki18n, kjs
, qtsvg
{
mkDerivation, lib,
extra-cmake-modules, kdoctools, qttools,
ki18n, kjs, qtsvg,
}:
kdeFramework {
mkDerivation {
name = "kjsembed";
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
propagatedBuildInputs = [ ki18n kjs qtsvg ];
nativeBuildInputs = [ extra-cmake-modules kdoctools qttools ];
buildInputs = [ ki18n qtsvg ];
propagatedBuildInputs = [ kjs ];
}

6
pkgs/development/libraries/kde-frameworks/kmediaplayer.nix
View File

@@ -1,12 +1,12 @@
{ kdeFramework, lib
{ mkDerivation, lib
, extra-cmake-modules
, kparts
, kxmlgui
}:
kdeFramework {
mkDerivation {
name = "kmediaplayer";
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
nativeBuildInputs = [ extra-cmake-modules ];
propagatedBuildInputs = [ kparts kxmlgui ];
buildInputs = [ kparts kxmlgui ];
}

18
pkgs/development/libraries/kde-frameworks/knewstuff.nix
View File

@@ -1,14 +1,18 @@
{ kdeFramework, lib, extra-cmake-modules, attica, karchive
, kcompletion, kconfig, kcoreaddons, ki18n, kiconthemes, kio
, kitemviews, kservice, ktextwidgets, kwidgetsaddons, kxmlgui
{
mkDerivation, lib,
extra-cmake-modules,
attica, karchive, kcompletion, kconfig, kcoreaddons, ki18n, kiconthemes,
kio, kitemviews, kservice, ktextwidgets, kwidgetsaddons, kxmlgui, qtbase,
qtdeclarative,
}:
kdeFramework {
mkDerivation {
name = "knewstuff";
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
nativeBuildInputs = [ extra-cmake-modules ];
propagatedBuildInputs = [
attica karchive kcompletion kconfig kcoreaddons ki18n kiconthemes kio
kitemviews kservice ktextwidgets kwidgetsaddons kxmlgui
buildInputs = [
karchive kcompletion kconfig kcoreaddons ki18n kiconthemes kio kitemviews
ktextwidgets kwidgetsaddons qtbase qtdeclarative
];
propagatedBuildInputs = [ attica kservice kxmlgui ];
}

6
pkgs/development/libraries/kde-frameworks/knotifications.nix
View File

@@ -1,4 +1,4 @@
{ kdeFramework, lib
{ mkDerivation, lib
, extra-cmake-modules
, kcodecs, kconfig, kcoreaddons, kwindowsystem
, libdbusmenu
@@ -6,11 +6,11 @@
, qttools, qtx11extras
}:
kdeFramework {
mkDerivation {
name = "knotifications";
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
nativeBuildInputs = [ extra-cmake-modules qttools ];
propagatedBuildInputs = [
buildInputs = [
kcodecs kconfig kcoreaddons kwindowsystem libdbusmenu phonon qtx11extras
];
}

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