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

Merge branch 'gnome-40'

Browse Source
This commit is contained in:
Jan Tojnar
2021-05-07 12:12:40 +02:00
parent 7916603819 e744a292dc
commit 9468b07326
247 changed files with 2920 additions and 1243 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/amtk/default.nix
+11 -4
View File
@@ -1,6 +1,8 @@
{ lib, stdenv
, fetchurl
, gtk3
, meson
, ninja
, pkg-config
, gobject-introspection
, gnome3
@@ -10,14 +12,16 @@
stdenv.mkDerivation rec {
pname = "amtk";
version = "5.2.0";
version = "5.3.1";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0y3hmmflw4i0y0yb9a8rlihbv3cbwnvdcf1n5jycwzpq9jxla1c2";
sha256 = "12v3nj1bb7507ndprjggq0hpz8k719b4bwvl8sm43p3ibmn27anm";
};
nativeBuildInputs = [
meson
ninja
pkg-config
dbus
gobject-introspection
@@ -32,10 +36,13 @@ stdenv.mkDerivation rec {
export NO_AT_BRIDGE=1
${xvfb_run}/bin/xvfb-run -s '-screen 0 800x600x24' dbus-run-session \
--config-file=${dbus.daemon}/share/dbus-1/session.conf \
make check
meson test --print-errorlogs
'';
passthru.updateScript = gnome3.updateScript { packageName = pname; };
passthru.updateScript = gnome3.updateScript {
packageName = pname;
versionPolicy = "none";
};
meta = with lib; {
homepage = "https://wiki.gnome.org/Projects/Amtk";
pkgs/development/libraries/appstream/default.nix
+54 -16
View File
@@ -1,20 +1,40 @@
{ lib, stdenv, substituteAll, fetchFromGitHub, meson, ninja, pkg-config, gettext
, xmlto, docbook_xsl, docbook_xml_dtd_45, libxslt
, libstemmer, glib, xapian, libxml2, libyaml, gobject-introspection
, pcre, itstool, gperf, vala, lmdb, libsoup
{ lib
, stdenv
, substituteAll
, fetchFromGitHub
, meson
, ninja
, pkg-config
, gettext
, xmlto
, docbook-xsl-nons
, docbook_xml_dtd_45
, libxslt
, libstemmer
, glib
, xapian
, libxml2
, libyaml
, gobject-introspection
, pcre
, itstool
, gperf
, vala
, lmdb
, curl
}:
stdenv.mkDerivation rec {
pname = "appstream";
version = "0.14.0";
version = "0.14.3";
outputs = [ "out" "dev" ];
src = fetchFromGitHub {
owner = "ximion";
repo = "appstream";
rev = "v${version}";
sha256 = "sha256-iYqmQ1/58t3ZdJTxYLDc5jkTG1lMBtQWMFFsYsszH9Q=";
owner = "ximion";
repo = "appstream";
rev = "v${version}";
sha256 = "sha256-wCQR+4/F5lVqWHHcH/WS4irBGRivz3c1imasyLDIZIs=";
};
patches = [
@@ -26,12 +46,30 @@ stdenv.mkDerivation rec {
];
nativeBuildInputs = [
meson ninja pkg-config gettext
libxslt xmlto docbook_xsl docbook_xml_dtd_45
gobject-introspection itstool vala
meson
ninja
pkg-config
gettext
libxslt
xmlto
docbook-xsl-nons
docbook_xml_dtd_45
gobject-introspection
itstool
vala
];
buildInputs = [ libstemmer pcre glib xapian libxml2 libyaml gperf lmdb libsoup ];
buildInputs = [
libstemmer
pcre
glib
xapian
libxml2
libyaml
gperf
lmdb
curl
];
mesonFlags = [
"-Dapidocs=false"
@@ -41,14 +79,14 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Software metadata handling library";
homepage = "https://www.freedesktop.org/wiki/Distributions/AppStream/";
homepage = "https://www.freedesktop.org/wiki/Distributions/AppStream/";
longDescription = ''
AppStream is a cross-distro effort for building Software-Center applications
and enhancing metadata provided by software components. It provides
specifications for meta-information which is shipped by upstream projects and
can be consumed by other software.
'';
license = licenses.lgpl21Plus;
platforms = platforms.unix;
license = licenses.lgpl21Plus;
platforms = platforms.unix;
};
}
pkgs/development/libraries/at-spi2-atk/default.nix
+1
View File
@@ -31,6 +31,7 @@ stdenv.mkDerivation rec {
passthru = {
updateScript = gnome3.updateScript {
packageName = pname;
versionPolicy = "odd-unstable";
};
};
pkgs/development/libraries/at-spi2-core/default.nix
+6 -3
View File
@@ -14,23 +14,25 @@
, libX11
, libXtst # at-spi2-core can be build without X support, but due it is a client-side library, GUI-less usage is a very rare case
, libXi
, libXext
, gnome3 # To pass updateScript
}:
stdenv.mkDerivation rec {
pname = "at-spi2-core";
version = "2.38.0";
version = "2.40.1";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "hONsP+ZoYhM/X+Ipdyt2qiUm4Q3lAUo3ePL6Rs5VDaU=";
sha256 = "0miqn8531czy9ffpxnsxsnk12w3d6sqjda3qyix8kns2xsjf6rlz";
};
outputs = [ "out" "dev" ];
nativeBuildInputs = [ meson ninja pkg-config gobject-introspection makeWrapper ];
buildInputs = [ libX11 libXtst libXi ];
# libXext is a transitive dependency of libXi
buildInputs = [ libX11 libXtst libXi libXext ];
# In atspi-2.pc dbus-1 glib-2.0
propagatedBuildInputs = [ dbus glib ];
@@ -45,6 +47,7 @@ stdenv.mkDerivation rec {
passthru = {
updateScript = gnome3.updateScript {
packageName = pname;
versionPolicy = "odd-unstable";
};
};
pkgs/development/libraries/atk/default.nix
+1
View File
@@ -36,6 +36,7 @@ stdenv.mkDerivation rec {
passthru = {
updateScript = gnome3.updateScript {
packageName = pname;
versionPolicy = "odd-unstable";
};
};
pkgs/development/libraries/atkmm/default.nix
+1
View File
@@ -20,6 +20,7 @@ stdenv.mkDerivation rec {
passthru = {
updateScript = gnome3.updateScript {
packageName = pname;
versionPolicy = "odd-unstable";
};
};
pkgs/development/libraries/cairomm/1.16.nix
+70
View File
@@ -0,0 +1,70 @@
{ stdenv
, lib
, fetchurl
, boost
, meson
, ninja
, pkg-config
, cairo
, fontconfig
, libsigcxx30
}:
stdenv.mkDerivation rec {
pname = "cairomm";
version = "1.16.0";
outputs = [ "out" "dev" ];
src = fetchurl {
url = "https://www.cairographics.org/releases/${pname}-${version}.tar.xz";
sha256 = "1ya4y7qa000cjawqwswbqv26y5icfkmhs5iiiil4dxgrqn91923y";
};
nativeBuildInputs = [
meson
ninja
pkg-config
];
buildInputs = [
boost # for tests
fontconfig
];
propagatedBuildInputs = [
cairo
libsigcxx30
];
mesonFlags = [
"-Dbuild-tests=true"
"-Dboost-shared=true"
];
# Meson is no longer able to pick up Boost automatically.
# https://github.com/NixOS/nixpkgs/issues/86131
BOOST_INCLUDEDIR = "${lib.getDev boost}/include";
BOOST_LIBRARYDIR = "${lib.getLib boost}/lib";
doCheck = true;
meta = with lib; {
description = "A 2D graphics library with support for multiple output devices";
longDescription = ''
Cairo is a 2D graphics library with support for multiple output
devices. Currently supported output targets include the X
Window System, Quartz, Win32, image buffers, PostScript, PDF,
and SVG file output. Experimental backends include OpenGL
(through glitz), XCB, BeOS, OS/2, and DirectFB.
Cairo is designed to produce consistent output on all output
media while taking advantage of display hardware acceleration
when available (e.g., through the X Render Extension).
'';
homepage = "https://www.cairographics.org/";
license = with licenses; [ lgpl2Plus mpl10 ];
maintainers = teams.gnome.members;
platforms = platforms.unix;
};
}
pkgs/development/libraries/clutter-gst/default.nix
+1
View File
@@ -19,6 +19,7 @@ stdenv.mkDerivation rec {
passthru = {
updateScript = gnome3.updateScript {
packageName = pname;
versionPolicy = "odd-unstable";
};
};
pkgs/development/libraries/clutter-gtk/default.nix
+1
View File
@@ -24,6 +24,7 @@ stdenv.mkDerivation rec {
passthru = {
updateScript = gnome3.updateScript {
packageName = pname;
versionPolicy = "odd-unstable";
};
};
pkgs/development/libraries/clutter/default.nix
+1
View File
@@ -31,6 +31,7 @@ stdenv.mkDerivation rec {
passthru = {
updateScript = gnome3.updateScript {
packageName = pname;
versionPolicy = "odd-unstable";
};
};
pkgs/development/libraries/cogl/default.nix
+1
View File
@@ -61,6 +61,7 @@ in stdenv.mkDerivation rec {
passthru = {
updateScript = gnome3.updateScript {
packageName = pname;
versionPolicy = "odd-unstable";
};
};
pkgs/development/libraries/dconf/default.nix
+3 -2
View File
@@ -19,14 +19,14 @@ let
in
stdenv.mkDerivation rec {
pname = "dconf";
version = "0.38.0";
version = "0.40.0";
outputs = [ "out" "lib" "dev" ]
++ lib.optional (!isCross) "devdoc";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0n2gqkp6d61h7gnnp2xnxp6w5wcl7w9ay58krrf729qd6d0hzxj5";
sha256 = "0cs5nayg080y8pb9b7qccm1ni8wkicdmqp1jsgc22110r6j24zyg";
};
nativeBuildInputs = [
@@ -63,6 +63,7 @@ stdenv.mkDerivation rec {
passthru = {
updateScript = gnome3.updateScript {
packageName = pname;
versionPolicy = "odd-unstable";
};
};
pkgs/development/libraries/folks/default.nix
+15 -18
View File
@@ -1,7 +1,6 @@
{ fetchurl
, lib, stdenv
, pkg-config
, fetchpatch
, meson
, ninja
, glib
@@ -18,6 +17,7 @@
, dbus
, libgee
, evolution-data-server
, libgdata
, libsecret
, db
, python3
@@ -34,29 +34,15 @@
stdenv.mkDerivation rec {
pname = "folks";
version = "0.14.0";
version = "0.15.2";
outputs = [ "out" "dev" "devdoc" ];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1f9b52vmwnq7s51vj26w2618dn2ph5g12ibbkbyk6fvxcgd7iryn";
sha256 = "08nirjax4m4g4ljr8ksq16wzmrvzq6myqh5rm0dw6pnijqk7nxzg";
};
patches = [
# Fix tests with e-d-s linked with libphonenumber support
# https://gitlab.gnome.org/GNOME/folks/merge_requests/40
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/folks/commit/6d443480a137f6a6ff345b21bf3cb31066eefbcd.patch";
sha256 = "D/Y2g12TT0qrcH+iJ2umu4Hmp0EJ3Hoedh0H3aWI+HY=";
})
];
mesonFlags = [
"-Ddocs=true"
"-Dtelepathy_backend=${lib.boolToString telepathySupport}"
];
nativeBuildInputs = [
gettext
gobject-introspection
@@ -75,6 +61,7 @@ stdenv.mkDerivation rec {
db
dbus-glib
evolution-data-server
libgdata # required for some backends transitively
libsecret
libsoup
libxml2
@@ -100,7 +87,17 @@ stdenv.mkDerivation rec {
]))
];
doCheck = true;
mesonFlags = [
"-Ddocs=true"
"-Dtelepathy_backend=${lib.boolToString telepathySupport}"
# For some reason, the tests are getting stuck on 31/32,
# even though the one missing test finishes just fine on next run,
# when tests are permuted differently. And another test that
# previously passed will be stuck instead.
"-Dtests=false"
];
doCheck = false;
# Prevents e-d-s add-contacts-stress-test from timing out
checkPhase = ''
pkgs/development/libraries/gcr/default.nix
+3 -2
View File
@@ -22,11 +22,11 @@
stdenv.mkDerivation rec {
pname = "gcr";
version = "3.38.1";
version = "3.40.0";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "F/yvnEqTpl+xxyuCZDuxAsEzRAhGh9WIbqZjE4aNnsk=";
sha256 = "udNkWl/ZU6VChcxk1PwEZzZGPb1NzCXK9ce1m+0wJ/U=";
};
postPatch = ''
@@ -84,6 +84,7 @@ stdenv.mkDerivation rec {
passthru = {
updateScript = gnome3.updateScript {
packageName = pname;
versionPolicy = "odd-unstable";
};
};
pkgs/development/libraries/gdk-pixbuf/default.nix
+25 -21
View File
@@ -7,11 +7,10 @@
, pkg-config
, gettext
, python3
, libxml2
, libxslt
, docbook-xsl-nons
, docbook_xml_dtd_43
, gtk-doc
, gi-docgen
, glib
, libtiff
, libjpeg
@@ -25,13 +24,13 @@
stdenv.mkDerivation rec {
pname = "gdk-pixbuf";
version = "2.42.2";
version = "2.42.6";
outputs = [ "out" "dev" "man" "devdoc" "installedTests" ];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "05ggmzwvrxq9w4zcvmrnnd6qplsmb4n95lj4q607c7arzlf6mil3";
sha256 = "0zz7pmw2z46g7mr1yjxbsdldd5pd03xbjc58inj8rxfqgrdvg9n4";
};
patches = [
@@ -45,14 +44,15 @@ stdenv.mkDerivation rec {
pkg-config
gettext
python3
libxml2
libxslt
docbook-xsl-nons
docbook_xml_dtd_43
gtk-doc
gobject-introspection
makeWrapper
glib
gi-docgen
# for man pages
libxslt
docbook-xsl-nons
docbook_xml_dtd_43
] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames;
propagatedBuildInputs = [
@@ -75,19 +75,26 @@ stdenv.mkDerivation rec {
substituteInPlace tests/meson.build --subst-var-by installedtestsprefix "$installedTests"
'';
preInstall = ''
PATH=$PATH:$out/bin # for install script
'';
postInstall =
# meson erroneously installs loaders with .dylib extension on Darwin.
# Their @rpath has to be replaced before gdk-pixbuf-query-loaders looks at them.
lib.optionalString stdenv.isDarwin ''
''
# All except one utility seem to be only useful during building.
moveToOutput "bin" "$dev"
moveToOutput "bin/gdk-pixbuf-thumbnailer" "$out"
# So that devhelp can find this.
mkdir -p "$devdoc/share/devhelp"
mv "$out/share/doc" "$devdoc/share/devhelp/books"
'' + lib.optionalString stdenv.isDarwin ''
# meson erroneously installs loaders with .dylib extension on Darwin.
# Their @rpath has to be replaced before gdk-pixbuf-query-loaders looks at them.
for f in $out/${passthru.moduleDir}/*.dylib; do
install_name_tool -change @rpath/libgdk_pixbuf-2.0.0.dylib $out/lib/libgdk_pixbuf-2.0.0.dylib $f
mv $f ''${f%.dylib}.so
done
''
# All except one utility seem to be only useful during building.
+ ''
moveToOutput "bin" "$dev"
moveToOutput "bin/gdk-pixbuf-thumbnailer" "$out"
'' + lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) ''
# We need to install 'loaders.cache' in lib/gdk-pixbuf-2.0/2.10.0/
$dev/bin/gdk-pixbuf-query-loaders --update-cache
@@ -100,10 +107,6 @@ stdenv.mkDerivation rec {
done
'';
preInstall = ''
PATH=$PATH:$out/bin # for install script
'';
# The tests take an excessive amount of time (> 1.5 hours) and memory (> 6 GB).
inherit doCheck;
@@ -114,6 +117,7 @@ stdenv.mkDerivation rec {
passthru = {
updateScript = gnome3.updateScript {
packageName = pname;
versionPolicy = "odd-unstable";
};
tests = {
pkgs/development/libraries/gegl/4.0.nix
+6 -5
View File
@@ -1,4 +1,5 @@
{ lib, stdenv
{ lib
, stdenv
, fetchurl
, pkg-config
, vala
@@ -35,14 +36,14 @@
stdenv.mkDerivation rec {
pname = "gegl";
version = "0.4.28";
version = "0.4.30";
outputs = [ "out" "dev" "devdoc" ];
outputBin = "dev";
src = fetchurl {
url = "https://download.gimp.org/pub/gegl/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "sha256-HRENhXfVTMo7NCOTFb03xXzLJ91DVWVQdKLSs/2JeQA=";
sha256 = "sha256-wRJ4LPQJaWniMhfM36vkIoTjXVQ1/wxD1A5McPrsqN0=";
};
nativeBuildInputs = [
@@ -103,8 +104,8 @@ stdenv.mkDerivation rec {
NIX_CFLAGS_COMPILE = "-lm";
postPatch = ''
chmod +x tests/opencl/opencl_test.sh tests/buffer/buffer-tests-run.sh
patchShebangs tests/ff-load-save/tests_ff_load_save.sh tests/opencl/opencl_test.sh tests/buffer/buffer-tests-run.sh tools/xml_insert.sh
chmod +x tests/opencl/opencl_test.sh
patchShebangs tests/ff-load-save/tests_ff_load_save.sh tests/opencl/opencl_test.sh tools/xml_insert.sh
'';
# tests fail to connect to the com.apple.fonts daemon in sandboxed mode
pkgs/development/libraries/gexiv2/default.nix
+1
View File
@@ -24,6 +24,7 @@ stdenv.mkDerivation rec {
passthru = {
updateScript = gnome3.updateScript {
packageName = pname;
versionPolicy = "odd-unstable";
};
};
pkgs/development/libraries/gfbgraph/default.nix
+1
View File
@@ -37,6 +37,7 @@ stdenv.mkDerivation rec {
passthru = {
updateScript = gnome3.updateScript {
packageName = pname;
versionPolicy = "odd-unstable";
};
};
pkgs/development/libraries/gjs/default.nix
+16 -14
View File
@@ -1,6 +1,6 @@
{ fetchurl
, fetchpatch
, lib, stdenv
, lib
, stdenv
, meson
, ninja
, pkg-config
@@ -16,6 +16,7 @@
, libxml2
, dbus
, gdk-pixbuf
, harfbuzz
, makeWrapper
, which
, xvfb_run
@@ -25,18 +26,26 @@
let
testDeps = [
gobject-introspection # for Gio and cairo typelibs
gtk3 atk pango.out gdk-pixbuf
gtk3 atk pango.out gdk-pixbuf harfbuzz
];
in stdenv.mkDerivation rec {
pname = "gjs";
version = "1.66.2";
version = "1.68.1";
outputs = [ "out" "dev" "installedTests" ];
src = fetchurl {
url = "mirror://gnome/sources/gjs/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "vX9fixcSd8wLue4XVLAkC2Lwana4sYyWjPRxs0qzTlk=";
sha256 = "0w2cbfpmc6alz7z8ycchhlkn586av5y8zk2xmgwzq10i0k13xyig";
};
outputs = [ "out" "dev" "installedTests" ];
patches = [
# Hard-code various paths
./fix-paths.patch
# Allow installing installed tests to a separate output.
./installed-tests-path.patch
];
nativeBuildInputs = [
meson
@@ -68,14 +77,6 @@ in stdenv.mkDerivation rec {
"-Dinstalled_test_prefix=${placeholder "installedTests"}"
];
patches = [
# Hard-code various paths
./fix-paths.patch
# Allow installing installed tests to a separate output.
./installed-tests-path.patch
];
doCheck = true;
postPatch = ''
@@ -91,6 +92,7 @@ in stdenv.mkDerivation rec {
mkdir -p $out/lib $installedTests/libexec/installed-tests/gjs
ln -s $PWD/libgjs.so.0 $out/lib/libgjs.so.0
ln -s $PWD/installed-tests/js/libgimarshallingtests.so $installedTests/libexec/installed-tests/gjs/libgimarshallingtests.so
ln -s $PWD/installed-tests/js/libgjstesttools/libgjstesttools.so $installedTests/libexec/installed-tests/gjs/libgjstesttools.so
ln -s $PWD/installed-tests/js/libregress.so $installedTests/libexec/installed-tests/gjs/libregress.so
ln -s $PWD/installed-tests/js/libwarnlib.so $installedTests/libexec/installed-tests/gjs/libwarnlib.so
'';
pkgs/development/libraries/glib-networking/default.nix
+3 -2
View File
@@ -18,13 +18,13 @@
stdenv.mkDerivation rec {
pname = "glib-networking";
version = "2.66.0";
version = "2.68.1";
outputs = [ "out" "installedTests" ];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "16807qwflbghp0c66jdx2gnaffvdp4bla35ppzp9dlgx6wjbxmy5";
sha256 = "0c1vylxly8k7g454g02spi44ybjidlwg461vp713zxd94k8qnpfh";
};
patches = [
@@ -76,6 +76,7 @@ stdenv.mkDerivation rec {
passthru = {
updateScript = gnome3.updateScript {
packageName = pname;
versionPolicy = "odd-unstable";
};
tests = {
pkgs/development/libraries/glib/default.nix
+2 -2
View File
@@ -45,11 +45,11 @@ in
stdenv.mkDerivation rec {
pname = "glib";
version = "2.66.8";
version = "2.68.1";
src = fetchurl {
url = "mirror://gnome/sources/glib/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "sha256-l7yH3ZE2VYmvXLv+oldIM66nobcYQP02Xs0oUsdrnIs=";
sha256 = "sha256-JBZUuWvTa4iqoSgU78SEO1eOVdR0QBA3J5Waw0aUQzM=";
};
patches = optionals stdenv.isDarwin [
pkgs/development/libraries/glibmm/2.68.nix
+59
View File
@@ -0,0 +1,59 @@
{ lib
, stdenv
, fetchurl
, pkg-config
, gnum4
, glib
, libsigcxx30
, gnome3
, Cocoa
, meson
, ninja
}:
stdenv.mkDerivation rec {
pname = "glibmm";
version = "2.68.0";
outputs = [ "out" "dev" ];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "sha256-wfOFcxkdzu2FoFYAiIz0z0aVlB8zlxW9Z9UcJBb083U=";
};
nativeBuildInputs = [
meson
pkg-config
ninja
gnum4
glib # for glib-compile-schemas
];
buildInputs = lib.optionals stdenv.isDarwin [
Cocoa
];
propagatedBuildInputs = [
glib
libsigcxx30
];
doCheck = false; # fails. one test needs the net, another /etc/fstab
passthru = {
updateScript = gnome3.updateScript {
packageName = pname;
attrPath = "glibmm_2_68";
versionPolicy = "odd-unstable";
};
};
meta = with lib; {
description = "C++ interface to the GLib library";
homepage = "https://gtkmm.org/";
license = licenses.lgpl2Plus;
maintainers = teams.gnome.members ++ (with maintainers; [ raskin ]);
platforms = platforms.unix;
};
}
pkgs/development/libraries/glibmm/default.nix
+1
View File
@@ -31,6 +31,7 @@ stdenv.mkDerivation rec {
passthru = {
updateScript = gnome3.updateScript {
packageName = pname;
versionPolicy = "odd-unstable";
};
};
pkgs/development/libraries/gnome-online-accounts/default.nix
+2 -3
View File
@@ -30,7 +30,7 @@
stdenv.mkDerivation rec {
pname = "gnome-online-accounts";
version = "3.38.1";
version = "3.40.0";
# https://gitlab.gnome.org/GNOME/gnome-online-accounts/issues/87
src = fetchFromGitLab {
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
owner = "GNOME";
repo = "gnome-online-accounts";
rev = version;
sha256 = "sha256-th7P++MC3GXX+349PJFEwHGGeMhxsGgoEDGnSYpY7E4=";
sha256 = "sha256-GuUWypfmfbovpDKnj6wSBuNeKJIfIyipY+01u/p4znU=";
};
outputs = [ "out" "man" "dev" "devdoc" ];
@@ -46,7 +46,6 @@ stdenv.mkDerivation rec {
mesonFlags = [
"-Dfedora=false" # not useful in NixOS or for NixOS users.
"-Dgtk_doc=true"
"-Dlastfm=true"
"-Dman=true"
"-Dmedia_server=true"
];
pkgs/development/libraries/gobject-introspection/absolute_gir_path.patch
+4 -2
View File
@@ -1,8 +1,10 @@
diff --git a/gir/cairo-1.0.gir.in b/gir/cairo-1.0.gir.in
index e4c9fb3d..3351b184 100644
--- a/gir/cairo-1.0.gir.in
+++ b/gir/cairo-1.0.gir.in
@@ -5,7 +5,7 @@
xmlns:glib="http://www.gtk.org/introspection/glib/1.0">
@@ -6,7 +6,7 @@
<package name="@CAIRO_GIR_PACKAGE@"/>
<c:include name="cairo-gobject.h"/>
<namespace name="cairo" version="1.0"
- shared-library="@CAIRO_SHARED_LIBRARY@"
+ shared-library="@cairoLib@/@CAIRO_SHARED_LIBRARY@"
pkgs/development/libraries/gobject-introspection/absolute_shlib_path.patch
+7 -8
View File
@@ -40,7 +40,7 @@
def _get_option_parser():
parser = optparse.OptionParser('%prog [options] sources',
version='%prog ' + giscanner.__version__)
@@ -205,6 +238,10 @@ match the namespace prefix.""")
@@ -214,6 +247,10 @@ match the namespace prefix.""")
parser.add_option("", "--filelist",
action="store", dest="filelist", default=[],
help="file containing headers and sources to be scanned")
@@ -66,7 +66,7 @@
# This is a what we do for non-la files. We assume that we are on an
# ELF-like system where ldd exists and the soname extracted with ldd is
# a filename that can be opened with dlopen().
@@ -106,7 +112,8 @@ def _resolve_non_libtool(options, binary, libraries):
@@ -108,7 +114,8 @@ def _resolve_non_libtool(options, binary, libraries):
output = output.decode("utf-8", "replace")
shlibs = resolve_from_ldd_output(libraries, output)
@@ -76,7 +76,7 @@
def sanitize_shlib_path(lib):
@@ -115,19 +122,18 @@ def sanitize_shlib_path(lib):
@@ -117,19 +124,18 @@ def sanitize_shlib_path(lib):
# In case we get relative paths on macOS (like @rpath) then we fall
# back to the basename as well:
# https://gitlab.gnome.org/GNOME/gobject-introspection/issues/222
@@ -101,7 +101,7 @@
if len(patterns) == 0:
return []
@@ -139,8 +145,11 @@ def resolve_from_ldd_output(libraries, output):
@@ -141,8 +147,11 @@ def resolve_from_ldd_output(libraries, output):
if line.endswith(':'):
continue
for word in line.split():
@@ -117,7 +117,7 @@
shlibs.append(m.group())
--- a/giscanner/utils.py
+++ b/giscanner/utils.py
@@ -111,17 +111,11 @@ def extract_libtool_shlib(la_file):
@@ -113,16 +113,11 @@ def extract_libtool_shlib(la_file):
if dlname is None:
return None
@@ -129,8 +129,7 @@
- if libdir is None:
- return dlbasename
- return libdir + '/' + dlbasename
- # From the comments in extract_libtool(), older libtools had
- # a path rather than the raw dlname
- # Older libtools had a path rather than the raw dlname
- return os.path.basename(dlname)
+ dlbasename = os.path.basename(dlname)
+ libdir = _extract_libdir_field(la_file)
@@ -139,7 +138,7 @@
+ return libdir + '/' + dlbasename
def extract_libtool(la_file):
# Returns arguments for invoking libtool, if applicable, otherwise None
--- a/tests/scanner/test_shlibs.py
+++ b/tests/scanner/test_shlibs.py
@@ -7,6 +7,30 @@ from giscanner.shlibs import resolve_from_ldd_output, sanitize_shlib_path
pkgs/development/libraries/gobject-introspection/default.nix
+3 -2
View File
@@ -26,7 +26,7 @@
stdenv.mkDerivation rec {
pname = "gobject-introspection";
version = "1.66.1";
version = "1.68.0";
# outputs TODO: share/gobject-introspection-1.0/tests is needed during build
# by pygobject3 (and maybe others), but it's only searched in $out
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "078n0q7b6z682mf4irclrksm73cyixq295mqnqifl9plwmgaai6x";
sha256 = "09sawnv3xj9pzgy2qrrk87dl3jibfphnswb61i5bh0d2h4j28afj";
};
patches = [
@@ -114,6 +114,7 @@ stdenv.mkDerivation rec {
passthru = {
updateScript = gnome3.updateScript {
packageName = pname;
versionPolicy = "odd-unstable";
};
};
pkgs/development/libraries/goffice/default.nix
+1
View File
@@ -26,6 +26,7 @@ stdenv.mkDerivation rec {
passthru = {
updateScript = gnome3.updateScript {
packageName = pname;
versionPolicy = "odd-unstable";
};
};
pkgs/development/libraries/gom/default.nix
+1
View File
@@ -50,6 +50,7 @@ stdenv.mkDerivation rec {
passthru = {
updateScript = gnome3.updateScript {
packageName = pname;
versionPolicy = "odd-unstable";
};
};
pkgs/development/libraries/goocanvasmm/default.nix
+1
View File
@@ -19,6 +19,7 @@ stdenv.mkDerivation rec {
updateScript = gnome3.updateScript {
packageName = pname;
attrPath = "goocanvasmm2";
versionPolicy = "odd-unstable";
};
};
pkgs/development/libraries/grilo-plugins/default.nix
+2 -2
View File
@@ -31,11 +31,11 @@
stdenv.mkDerivation rec {
pname = "grilo-plugins";
version = "0.3.12";
version = "0.3.13";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0xr59gzb8gw2bgj14mjllgn8y7srh373j0fp0v16ak8nd84dzdn6";
sha256 = "HEMF1nNkqTBUODbMGYLzDpRpc7j/avPv4x2HcJq1IPg=";
};
patches = [
pkgs/development/libraries/gsettings-desktop-schemas/default.nix
+3 -3
View File
@@ -12,11 +12,11 @@
stdenv.mkDerivation rec {
pname = "gsettings-desktop-schemas";
version = "3.38.0";
version = "40.0";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0rwcg9sd5rv7gjwapcd1jjk6l16w0p3j7wkicq1rdch4c0kch12p";
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
sha256 = "11an29br55dp0b26kfqlrfxj19glfrmhcdpds2n1w9n04gq3pf7i";
};
nativeBuildInputs = [
pkgs/development/libraries/gsound/default.nix
+1
View File
@@ -15,6 +15,7 @@ stdenv.mkDerivation rec {
passthru = {
updateScript = gnome3.updateScript {
packageName = pname;
versionPolicy = "odd-unstable";
};
};
pkgs/development/libraries/gstreamer/bad/default.nix
+10
View File
@@ -1,6 +1,7 @@
{ lib
, stdenv
, fetchurl
, fetchpatch
, meson
, ninja
, gettext
@@ -103,6 +104,15 @@ stdenv.mkDerivation rec {
patches = [
# Use pkgconfig to inject the includedirs
./fix_pkgconfig_includedir.patch
] ++ lib.optionals stdenv.isDarwin [
# Fix “error: cannot initialize a parameter of type 'unsigned long *' with an rvalue of type 'typename std::remove_reference<decltype(*(&opencv_dilate_erode_type))>::type *' (aka 'volatile unsigned long *')” on Darwin.
(fetchpatch {
url = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/commit/640a65bf966df065d41a511e2d76d1f26a2e770c.patch";
sha256 = "E5pig+qEfR58Jticr6ydFxZOhM3ZJ8zgrf5K4BdiB/Y=";
includes = [
"ext/opencv/gstcvdilateerode.cpp"
];
})
];
nativeBuildInputs = [
pkgs/development/libraries/gstreamer/gstreamermm/default.nix
+2 -2
View File
@@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
passthru = {
updateScript = gnome3.updateScript {
packageName = pname;
versionPolicy = "none"; # Unpredictable version stability
packageName = "gst_all_1.gstreamermm";
versionPolicy = "odd-unstable";
};
};
pkgs/development/libraries/gtk/4.x.nix
+30 -29
View File
@@ -5,9 +5,7 @@
, pkg-config
, gettext
, graphene
, docbook-xsl-nons
, docbook_xml_dtd_43
, gtk-doc
, gi-docgen
, meson
, ninja
, python3
@@ -45,7 +43,6 @@
, wayland-protocols
, xineramaSupport ? stdenv.isLinux
, cupsSupport ? stdenv.isLinux
, withGtkDoc ? stdenv.isLinux
, cups
, AppKit
, Cocoa
@@ -64,9 +61,9 @@ in
stdenv.mkDerivation rec {
pname = "gtk4";
version = "4.0.3";
version = "4.2.1";
outputs = [ "out" "dev" ] ++ lib.optional withGtkDoc "devdoc";
outputs = [ "out" "dev" ] ++ lib.optionals x11Support [ "devdoc" ];
outputBin = "dev";
setupHooks = [
@@ -76,7 +73,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://gnome/sources/gtk/${lib.versions.majorMinor version}/gtk-${version}.tar.xz";
sha256 = "18mJNyV5C1C9mjuyeIVtnVQ7RLa5uVHXtg573swTGJA=";
sha256 = "AjFpd13kPwof3gZvvBnXhUXqanViwZFavem4rkpzCeY=";
};
nativeBuildInputs = [
@@ -88,21 +85,17 @@ stdenv.mkDerivation rec {
pkg-config
python3
sassc
] ++ setupHooks ++ lib.optionals withGtkDoc [
pandoc
docbook_xml_dtd_43
docbook-xsl-nons
gtk-doc
# For xmllint
libxml2
];
gi-docgen
] ++ setupHooks;
buildInputs = [
libxkbcommon
epoxy
json-glib
isocodes
] ++ lib.optionals (!stdenv.isDarwin) [
vulkan-headers
] ++ [
librest
libsoup
ffmpeg
@@ -141,18 +134,27 @@ stdenv.mkDerivation rec {
glib
graphene
pango
vulkan-loader # TODO: Possibly not used on Darwin
] ++ lib.optionals (!stdenv.isDarwin) [
vulkan-loader
] ++ [
# Required for GSettings schemas at runtime.
# Will be picked up by wrapGAppsHook.
gsettings-desktop-schemas
];
mesonFlags = [
"-Dgtk_doc=${lib.boolToString withGtkDoc}"
"-Dtests=false"
"-Dtracker3=${lib.boolToString trackerSupport}"
"-Dbroadway_backend=${lib.boolToString broadwaySupport}"
# ../docs/tools/shooter.c:4:10: fatal error: 'cairo-xlib.h' file not found
"-Dgtk_doc=${lib.boolToString x11Support}"
"-Dbuild-tests=false"
"-Dtracker=${if trackerSupport then "enabled" else "disabled"}"
"-Dbroadway-backend=${lib.boolToString broadwaySupport}"
] ++ lib.optionals (!cupsSupport) [
"-Dprint-cups=disabled"
] ++ lib.optionals stdenv.isDarwin [
"-Dvulkan=disabled"
"-Dmedia-gstreamer=disabled" # requires gstreamer-gl
] ++ lib.optionals (!x11Support) [
"-Dx11-backend=false"
];
doCheck = false; # needs X11
@@ -171,20 +173,12 @@ stdenv.mkDerivation rec {
gdk/gen-gdk-gresources-xml.py
gtk/gen-gtk-gresources-xml.py
gtk/gentypefuncs.py
docs/reference/gtk/gtk-markdown-to-docbook
)
chmod +x ''${files[@]}
patchShebangs ''${files[@]}
'';
postBuild = lib.optionalString withGtkDoc ''
# Meson not building `custom_target`s passed to `custom_files` argument of `gnome.gtkdoc` function
# as part of the `install` target. We have to build the docs manually first.
# https://github.com/mesonbuild/meson/issues/2831
ninja g{t,d,s}k4-doc
'';
preInstall = ''
OLD_PATH="$PATH"
PATH="$PATH:$dev/bin" # so the install script finds gtk4-update-icon-cache
@@ -202,6 +196,13 @@ stdenv.mkDerivation rec {
for f in $dev/bin/gtk4-encode-symbolic-svg; do
wrapProgram $f --prefix XDG_DATA_DIRS : "${shared-mime-info}/share"
done
'' + lib.optionalString x11Support ''
# So that DevHelp can find this.
# TODO: Remove this with DevHelp 41.
mkdir -p "$devdoc/share/devhelp/books"
mv "$out/share/doc/"* "$devdoc/share/devhelp/books"
rmdir -p --ignore-fail-on-non-empty "$out/share/doc"
'';
# Wrap demos
pkgs/development/libraries/gtkmm/3.x.nix
+3 -2
View File
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "gtkmm";
version = "3.24.3";
version = "3.24.4";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "sha256-YEl8T381TDvSVXSF8CVPi3tM9L68n+4L4mp3dE6s1DU=";
sha256 = "sha256-m+txw+kM/Pt5A5a1Hj9ecWmWZ1Hv1PPvlpcRS+O+Z0M=";
};
outputs = [ "out" "dev" ];
@@ -25,6 +25,7 @@ stdenv.mkDerivation rec {
updateScript = gnome3.updateScript {
packageName = pname;
attrPath = "${pname}3";
versionPolicy = "odd-unstable";
};
};
pkgs/development/libraries/gtkmm/4.x.nix
+91
View File
@@ -0,0 +1,91 @@
{ stdenv
, lib
, fetchurl
, pkg-config
, meson
, ninja
, python3
, gtk4
, glibmm_2_68
, cairomm_1_16
, pangomm_2_48
, epoxy
, gnome3
, makeFontsConf
, xvfb_run
}:
stdenv.mkDerivation rec {
pname = "gtkmm";
version = "4.0.1";
outputs = [ "out" "dev" ];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "sha256-iXPZvHhI4CyyBR4F8+46S6/+L+tK9KVIfw4xMu7AOIQ=";
};
nativeBuildInputs = [
pkg-config
meson
ninja
python3
];
buildInputs = [
epoxy
];
propagatedBuildInputs = [
glibmm_2_68
gtk4
cairomm_1_16
pangomm_2_48
];
checkInputs = [
xvfb_run
];
# Tests require fontconfig.
FONTCONFIG_FILE = makeFontsConf {
fontDirectories = [ ];
};
doCheck = true;
checkPhase = ''
runHook preCheck
xvfb-run -s '-screen 0 800x600x24' \
meson test --print-errorlogs
runHook postCheck
'';
passthru = {
updateScript = gnome3.updateScript {
packageName = pname;
attrPath = "${pname}4";
versionPolicy = "odd-unstable";
};
};
meta = with lib; {
description = "C++ interface to the GTK graphical user interface library";
longDescription = ''
gtkmm is the official C++ interface for the popular GUI library
GTK. Highlights include typesafe callbacks, and a
comprehensive set of widgets that are easily extensible via
inheritance. You can create user interfaces either in code or
with the Glade User Interface designer, using libglademm.
There's extensive documentation, including API reference and a
tutorial.
'';
homepage = "https://gtkmm.org/";
license = licenses.lgpl2Plus;
maintainers = teams.gnome.members ++ (with maintainers; [ raskin vcunat ]);
platforms = platforms.unix;
};
}
pkgs/development/libraries/gtksourceview/4.x.nix
+67 -21
View File
@@ -1,32 +1,42 @@
{ lib, stdenv, fetchurl, fetchpatch, pkg-config, atk, cairo, glib, gtk3, pango, fribidi, vala
, libxml2, perl, gettext, gnome3, gobject-introspection, dbus, xvfb_run, shared-mime-info
, meson, ninja }:
{ lib
, stdenv
, fetchurl
, fetchpatch
, meson
, ninja
, pkg-config
, atk
, cairo
, glib
, gtk3
, pango
, fribidi
, vala
, libxml2
, perl
, gettext
, gnome3
, gobject-introspection
, dbus
, xvfb_run
, shared-mime-info
}:
stdenv.mkDerivation rec {
pname = "gtksourceview";
version = "4.8.1";
outputs = [ "out" "dev" ];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0WPXG1/K+8Wx7sbdhB7b283dOnURzV/c/9hri7/mmsE=";
};
propagatedBuildInputs = [
# Required by gtksourceview-4.0.pc
gtk3
# Used by gtk_source_language_manager_guess_language
shared-mime-info
];
outputs = [ "out" "dev" ];
nativeBuildInputs = [ meson ninja pkg-config gettext perl gobject-introspection vala ];
checkInputs = [ xvfb_run dbus ];
buildInputs = [ atk cairo glib pango fribidi libxml2 ];
patches = [
# By default, the library loads syntaxes from XDG_DATA_DIRS and user directory
# but not from its own datadr (it assumes it will be in XDG_DATA_DIRS).
# Since this is not generally true with Nix, let’s add $out/share unconditionally.
./4.x-nix_share_path.patch
# fixes intermittent "gtksourceview-gresources.h: no such file" errors
@@ -37,27 +47,63 @@ stdenv.mkDerivation rec {
})
];
enableParallelBuilding = true;
nativeBuildInputs = [
meson
ninja
pkg-config
gettext
perl
gobject-introspection
vala
];
buildInputs = [
atk
cairo
glib
pango
fribidi
libxml2
];
propagatedBuildInputs = [
# Required by gtksourceview-4.0.pc
gtk3
# Used by gtk_source_language_manager_guess_language
shared-mime-info
];
checkInputs = [
xvfb_run
dbus
];
doCheck = stdenv.isLinux;
checkPhase = ''
runHook preCheck
XDG_DATA_DIRS="$XDG_DATA_DIRS:${shared-mime-info}/share" \
xvfb-run -s '-screen 0 800x600x24' dbus-run-session \
--config-file=${dbus.daemon}/share/dbus-1/session.conf \
meson test --no-rebuild --print-errorlogs
runHook postCheck
'';
passthru = {
updateScript = gnome3.updateScript {
packageName = "gtksourceview";
attrPath = "gtksourceview4";
versionPolicy = "odd-unstable";
};
};
meta = with lib; {
description = "Source code editing widget for GTK";
homepage = "https://wiki.gnome.org/Projects/GtkSourceView";
platforms = with platforms; linux ++ darwin;
license = licenses.lgpl21;
platforms = platforms.unix;
license = licenses.lgpl21Plus;
maintainers = teams.gnome.members;
};
}
pkgs/development/libraries/gtksourceview/5.x.nix
+99
View File
@@ -0,0 +1,99 @@
{ lib
, stdenv
, fetchurl
, meson
, ninja
, pkg-config
, glib
, pcre2
, gtk4
, pango
, fribidi
, vala
, libxml2
, perl
, gettext
, gnome3
, gobject-introspection
, dbus
, xvfb_run
, shared-mime-info
}:
stdenv.mkDerivation rec {
pname = "gtksourceview";
version = "5.0.0";
outputs = [ "out" "dev" ];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1hyrmh9r1zd5kjh5ch9d7bhk2kphbqhm7ijfxfkcdln8q0rnd0k4";
};
patches = [
# By default, the library loads syntaxes from XDG_DATA_DIRS and user directory
# but not from its own datadr (it assumes it will be in XDG_DATA_DIRS).
# Since this is not generally true with Nix, let’s add $out/share unconditionally.
./4.x-nix_share_path.patch
];
nativeBuildInputs = [
meson
ninja
pkg-config
gettext
perl
gobject-introspection
vala
];
buildInputs = [
glib
pcre2
pango
fribidi
libxml2
];
propagatedBuildInputs = [
# Required by gtksourceview-5.0.pc
gtk4
# Used by gtk_source_language_manager_guess_language
shared-mime-info
];
checkInputs = [
xvfb_run
dbus
];
doCheck = stdenv.isLinux;
checkPhase = ''
runHook preCheck
XDG_DATA_DIRS="$XDG_DATA_DIRS:${shared-mime-info}/share" \
xvfb-run -s '-screen 0 800x600x24' dbus-run-session \
--config-file=${dbus.daemon}/share/dbus-1/session.conf \
meson test --no-rebuild --print-errorlogs
runHook postCheck
'';
passthru = {
updateScript = gnome3.updateScript {
packageName = "gtksourceview";
attrPath = "gtksourceview5";
versionPolicy = "odd-unstable";
};
};
meta = with lib; {
description = "Source code editing widget for GTK";
homepage = "https://wiki.gnome.org/Projects/GtkSourceView";
platforms = platforms.unix;
license = licenses.lgpl21Plus;
maintainers = teams.gnome.members;
};
}
pkgs/development/libraries/gupnp-av/default.nix
+1
View File
@@ -45,6 +45,7 @@ stdenv.mkDerivation rec {
passthru = {
updateScript = gnome3.updateScript {
packageName = pname;
versionPolicy = "odd-unstable";
};
};
pkgs/development/libraries/gupnp-dlna/default.nix
+1
View File
@@ -50,6 +50,7 @@ stdenv.mkDerivation rec {
passthru = {
updateScript = gnome3.updateScript {
packageName = pname;
versionPolicy = "odd-unstable";
};
};
pkgs/development/libraries/gupnp-igd/default.nix
+1
View File
@@ -51,6 +51,7 @@ stdenv.mkDerivation rec {
passthru = {
updateScript = gnome3.updateScript {
packageName = pname;
versionPolicy = "odd-unstable";
};
};
pkgs/development/libraries/gvfs/default.nix
+3 -2
View File
@@ -41,11 +41,11 @@
stdenv.mkDerivation rec {
pname = "gvfs";
version = "1.46.2";
version = "1.48.1";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "2D+hYChmcMA+uJAkBgbYr6fqajqBjorRfu7Y2XZIe9c=";
sha256 = "1hlxl6368h6nyqp1888szxs9hnpcw98k3h23dgqi29xd38klzsmj";
};
postPatch = ''
@@ -119,6 +119,7 @@ stdenv.mkDerivation rec {
passthru = {
updateScript = gnome3.updateScript {
packageName = pname;
versionPolicy = "odd-unstable";
};
};
pkgs/development/libraries/json-glib/default.nix
+1
View File
@@ -48,6 +48,7 @@ stdenv.mkDerivation rec {
passthru = {
updateScript = gnome3.updateScript {
packageName = pname;
versionPolicy = "odd-unstable";
};
};
pkgs/development/libraries/jsonrpc-glib/default.nix
+1
View File
@@ -24,6 +24,7 @@ stdenv.mkDerivation rec {
passthru = {
updateScript = gnome3.updateScript {
packageName = pname;
versionPolicy = "odd-unstable";
};
};
pkgs/development/libraries/lasem/default.nix
+1
View File
@@ -24,6 +24,7 @@ stdenv.mkDerivation rec {
passthru = {
updateScript = gnome3.updateScript {
packageName = pname;
versionPolicy = "odd-unstable";
};
};
pkgs/development/libraries/libblockdev/default.nix
+8 -1
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, substituteAll, autoreconfHook, pkg-config, gtk-doc
{ lib, stdenv, fetchFromGitHub, fetchpatch, substituteAll, autoreconfHook, pkg-config, gtk-doc
, docbook_xml_dtd_43, python3, gobject-introspection, glib, udev, kmod, parted
, cryptsetup, lvm2, dmraid, util-linux, libbytesize, libndctl, nss, volume_key
, libxslt, docbook_xsl, gptfdisk, libyaml, autoconf-archive
@@ -22,6 +22,13 @@ stdenv.mkDerivation rec {
src = ./fix-paths.patch;
sgdisk = "${gptfdisk}/bin/sgdisk";
})
# fix build with glib 2.68 (g_memdup is deprecated)
# https://github.com/storaged-project/libblockdev/pull/623
(fetchpatch {
url = "https://github.com/storaged-project/libblockdev/commit/5528baef6ccc835a06c45f9db34a2c9c3f2dd940.patch";
sha256 = "jxq4BLeyTMeNvBvY8k8QXIvYSJ2Gah0J75pq6FpG7PM=";
})
];
postPatch = ''
pkgs/development/libraries/libchamplain/default.nix
+1
View File
@@ -26,6 +26,7 @@ stdenv.mkDerivation rec {
passthru = {
updateScript = gnome3.updateScript {
packageName = pname;
versionPolicy = "odd-unstable";
};
};
pkgs/development/libraries/libcryptui/default.nix
+1
View File
@@ -22,6 +22,7 @@ stdenv.mkDerivation rec {
passthru = {
updateScript = gnome3.updateScript {
packageName = pname;
versionPolicy = "odd-unstable";
};
};
pkgs/development/libraries/libdazzle/default.nix
+2 -2
View File
@@ -3,14 +3,14 @@
stdenv.mkDerivation rec {
pname = "libdazzle";
version = "3.38.0";
version = "3.40.0";
outputs = [ "out" "dev" "devdoc" ];
outputBin = "dev";
src = fetchurl {
url = "mirror://gnome/sources/libdazzle/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "13v7s46cgw135ycx0byn7am4inn33slrhljq0v0wwfwl2y1g52p1";
sha256 = "19abrrjsyjhhl1xflnb0likb9wwzz78fa1mk2b064rpscmz9mafv";
};
nativeBuildInputs = [ ninja meson pkg-config vala gobject-introspection libxml2 gtk-doc docbook_xsl docbook_xml_dtd_43 dbus xvfb_run glib ];
pkgs/development/libraries/libepc/default.nix
+1
View File
@@ -34,6 +34,7 @@ in stdenv.mkDerivation rec {
passthru = {
updateScript = gnome3.updateScript {
packageName = pname;
versionPolicy = "odd-unstable";
};
};
pkgs/development/libraries/libgda/6.x.nix
+1
View File
@@ -74,6 +74,7 @@ stdenv.mkDerivation rec {
updateScript = gnome3.updateScript {
packageName = pname;
attrPath = "libgda6";
versionPolicy = "odd-unstable";
};
};
pkgs/development/libraries/libgda/default.nix
+1
View File
@@ -86,6 +86,7 @@ assert postgresSupport -> postgresql != null;
passthru = {
updateScript = gnome3.updateScript {
packageName = pname;
versionPolicy = "odd-unstable";
};
};
pkgs/development/libraries/libgdamm/default.nix
+1
View File
@@ -26,6 +26,7 @@ in stdenv.mkDerivation rec {
passthru = {
updateScript = gnome3.updateScript {
packageName = pname;
versionPolicy = "odd-unstable";
};
};
pkgs/development/libraries/libgee/default.nix
+3 -2
View File
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "libgee";
version = "0.20.3";
version = "0.20.4";
outputs = [ "out" "dev" ];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1pm525wm11dhwz24m8bpcln9547lmrigl6cxf3qsbg4cr3pyvdfh";
sha256 = "03nyf8n7i7f67fsh220g52slmihdk1lv4iwspm7xmkgrj3rink2j";
};
doCheck = true;
@@ -22,6 +22,7 @@ stdenv.mkDerivation rec {
passthru = {
updateScript = gnome3.updateScript {
packageName = pname;
versionPolicy = "odd-unstable";
};
};
pkgs/development/libraries/libgnomekbd/default.nix
+7 -4
View File
@@ -11,10 +11,6 @@ stdenv.mkDerivation rec {
sha256 = "0y962ykn3rr9gylj0pwpww7bi20lmhvsw6qvxs5bisbn2mih5jpp";
};
passthru = {
updateScript = gnome3.updateScript { packageName = pname; };
};
nativeBuildInputs = [
file
intltool
@@ -29,6 +25,13 @@ stdenv.mkDerivation rec {
glib
];
passthru = {
updateScript = gnome3.updateScript {
packageName = pname;
versionPolicy = "odd-unstable";
};
};
meta = with lib; {
description = "Keyboard management library";
maintainers = teams.gnome.members;
pkgs/development/libraries/libgsf/default.nix
+1
View File
@@ -25,6 +25,7 @@ stdenv.mkDerivation rec {
passthru = {
updateScript = gnome3.updateScript {
packageName = pname;
versionPolicy = "odd-unstable";
};
};
pkgs/development/libraries/libgtop/default.nix
+1
View File
@@ -33,6 +33,7 @@ stdenv.mkDerivation rec {
passthru = {
updateScript = gnome3.updateScript {
packageName = pname;
versionPolicy = "odd-unstable";
};
};
pkgs/development/libraries/libgudev/default.nix
+21 -6
View File
@@ -1,28 +1,43 @@
{ lib, stdenv
, fetchurl
, pkg-config
, meson
, ninja
, udev
, glib
, gobject-introspection
, gnome3
, vala
}:
stdenv.mkDerivation rec {
pname = "libgudev";
version = "234";
version = "236";
outputs = [ "out" "dev" ];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0drf39qhsdz35kwb18hnfj2ig4yfxhfks66m783zlhnvy2narbhv";
sha256 = "094mgjmwgsgqrr1i0vd20ynvlkihvs3vgbmpbrhswjsrdp86j0z5";
};
nativeBuildInputs = [ pkg-config gobject-introspection ];
buildInputs = [ udev glib ];
nativeBuildInputs = [
pkg-config
gobject-introspection
meson
ninja
vala
];
# There's a dependency cycle with umockdev and the tests fail to LD_PRELOAD anyway.
configureFlags = [ "--disable-umockdev" ];
buildInputs = [
udev
glib
];
mesonFlags = [
# There's a dependency cycle with umockdev and the tests fail to LD_PRELOAD anyway
"-Dtests=disabled"
];
passthru = {
updateScript = gnome3.updateScript {
pkgs/development/libraries/libgweather/default.nix
+51 -11
View File
@@ -1,24 +1,57 @@
{ lib, stdenv, fetchurl, meson, ninja, pkg-config, libxml2, glib, gtk3, gettext, libsoup
, gtk-doc, docbook_xsl, docbook_xml_dtd_43, gobject-introspection, python3, tzdata, geocode-glib, vala, gnome3 }:
{ lib
, stdenv
, fetchurl
, meson
, ninja
, pkg-config
, libxml2
, glib
, gtk3
, gettext
, libsoup
, gtk-doc
, docbook-xsl-nons
, docbook_xml_dtd_43
, gobject-introspection
, python3
, tzdata
, geocode-glib
, vala
, gnome3
}:
stdenv.mkDerivation rec {
pname = "libgweather";
version = "3.36.1";
version = "40.0";
outputs = [ "out" "dev" "devdoc" ];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0l74hc02rvzm4p530y539a67jwb080fqdaazdl8j0fr3xvq0j9yy";
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
sha256 = "1rkf4yv43qcahyx7bismdv6z2vh5azdnm1fqfmnzrada9cm8ykna";
};
nativeBuildInputs = [ meson ninja pkg-config gettext vala gtk-doc docbook_xsl docbook_xml_dtd_43 gobject-introspection python3 ];
buildInputs = [ glib gtk3 libsoup libxml2 geocode-glib ];
nativeBuildInputs = [
meson
ninja
pkg-config
gettext
vala
gtk-doc
docbook-xsl-nons
docbook_xml_dtd_43
gobject-introspection
python3
python3.pkgs.pygobject3
];
postPatch = ''
chmod +x meson/meson_post_install.py
patchShebangs meson/meson_post_install.py
'';
buildInputs = [
glib
gtk3
libsoup
libxml2
geocode-glib
];
mesonFlags = [
"-Dzoneinfo_dir=${tzdata}/share/zoneinfo"
@@ -26,9 +59,16 @@ stdenv.mkDerivation rec {
"-Dgtk_doc=true"
];
postPatch = ''
chmod +x meson/meson_post_install.py
patchShebangs meson/meson_post_install.py
patchShebangs data/gen_locations_variant.py
'';
passthru = {
updateScript = gnome3.updateScript {
packageName = pname;
versionPolicy = "odd-unstable";
};
};
pkgs/development/libraries/libhandy/default.nix
+37 -7
View File
@@ -1,4 +1,5 @@
{ lib, stdenv
{ lib
, stdenv
, fetchurl
, meson
, ninja
@@ -6,9 +7,10 @@
, gobject-introspection
, vala
, gtk-doc
, docbook_xsl
, docbook-xsl-nons
, docbook_xml_dtd_43
, gtk3
, enableGlade ? false
, glade
, dbus
, xvfb_run
@@ -18,23 +20,32 @@
, hicolor-icon-theme
, at-spi2-atk
, at-spi2-core
, gnome3
, libhandy
, runCommand
}:
stdenv.mkDerivation rec {
pname = "libhandy";
version = "1.2.0";
version = "1.2.2";
outputs = [ "out" "dev" "devdoc" "glade" ];
outputs = [
"out"
"dev"
"devdoc"
] ++ lib.optionals enableGlade [
"glade"
];
outputBin = "dev";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "sha256-OfWQriCRDnb+HAYHsuvliXUPRWENau7Fww4u5gKiCyU=";
sha256 = "sha256-R//Shl0CvRyleVIt6t1+L5U2Lx8gJGL9XuriuBZosEg=";
};
nativeBuildInputs = [
docbook_xml_dtd_43
docbook_xsl
docbook-xsl-nons
gobject-introspection
gtk-doc
libxml2
@@ -46,9 +57,10 @@ stdenv.mkDerivation rec {
buildInputs = [
gdk-pixbuf
glade
gtk3
libxml2
] ++ lib.optionals enableGlade [
glade
];
checkInputs = [
@@ -62,6 +74,7 @@ stdenv.mkDerivation rec {
mesonFlags = [
"-Dgtk_doc=true"
"-Dglade_catalog=${if enableGlade then "enabled" else "disabled"}"
];
# Uses define_variable in pkg-config, but we still need it to use the glade output
@@ -79,6 +92,23 @@ stdenv.mkDerivation rec {
meson test --print-errorlogs
'';
passthru = {
updateScript = gnome3.updateScript {
packageName = pname;
};
} // lib.optionalAttrs (!enableGlade) {
glade =
let
libhandyWithGlade = libhandy.override {
enableGlade = true;
};
in runCommand "${libhandy.name}-glade" {} ''
cp -r "${libhandyWithGlade.glade}" "$out"
chmod -R +w "$out"
sed -e "s#${libhandyWithGlade.out}#${libhandy.out}#g" -e "s#${libhandyWithGlade.glade}#$out#g" -i $(find "$out" -type f)
'';
};
meta = with lib; {
changelog = "https://gitlab.gnome.org/GNOME/libhandy/-/tags/${version}";
description = "Building blocks for modern adaptive GNOME apps";
pkgs/development/libraries/libhttpseverywhere/default.nix
+1
View File
@@ -36,6 +36,7 @@ in stdenv.mkDerivation rec {
passthru = {
updateScript = gnome3.updateScript {
packageName = pname;
versionPolicy = "odd-unstable";
};
};
pkgs/development/libraries/libmanette/default.nix
+1
View File
@@ -51,6 +51,7 @@ stdenv.mkDerivation rec {
passthru = {
updateScript = gnome3.updateScript {
packageName = pname;
versionPolicy = "odd-unstable";
};
};
pkgs/development/libraries/libpeas/default.nix
+3 -2
View File
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "libpeas";
version = "1.28.0";
version = "1.30.0";
outputs = [ "out" "dev" ];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "05cb7drn6arc4gi02wgsvzibigi2riz5gnfnmlb0zmbfnj9ikna2";
sha256 = "18xrk1c1ixlhkmykcfiafrl2am470ws687xqvjlq40zwkcp5dx8b";
};
nativeBuildInputs = [ pkg-config meson ninja gettext gobject-introspection ];
@@ -23,6 +23,7 @@ stdenv.mkDerivation rec {
passthru = {
updateScript = gnome3.updateScript {
packageName = pname;
versionPolicy = "odd-unstable";
};
};
pkgs/development/libraries/libpst/default.nix
+4 -3
View File
@@ -12,11 +12,12 @@
}:
stdenv.mkDerivation rec {
name = "libpst-0.6.75";
pname = "libpst";
version = "0.6.76";
src = fetchurl {
url = "http://www.five-ten-sg.com/libpst/packages/${name}.tar.gz";
sha256 = "11wrf47i3brlxg25wsfz17373q7m5fpjxn2lr41dj252ignqzaac";
url = "http://www.five-ten-sg.com/libpst/packages/${pname}-${version}.tar.gz";
sha256 = "0hhbbb8ddsgjhv9y1xd8s9ixlhdnjmhw12v06jwx4j6vpgp1na9x";
};
nativeBuildInputs = [
pkgs/development/libraries/librest/default.nix
+25 -6
View File
@@ -1,4 +1,12 @@
{ lib, stdenv, fetchurl, pkg-config, glib, libsoup, gobject-introspection, gnome3 }:
{ lib
, stdenv
, fetchurl
, pkg-config
, glib
, libsoup
, gobject-introspection
, gnome3
}:
stdenv.mkDerivation rec {
pname = "rest";
@@ -9,23 +17,34 @@ stdenv.mkDerivation rec {
sha256 = "0513aad38e5d3cedd4ae3c551634e3be1b9baaa79775e53b2dba9456f15b01c9";
};
nativeBuildInputs = [ pkg-config gobject-introspection ];
buildInputs = [ glib libsoup ];
nativeBuildInputs = [
pkg-config
gobject-introspection
];
configureFlags = [ "--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt" ];
buildInputs = [
glib
libsoup
];
configureFlags = [
# Remove when https://gitlab.gnome.org/GNOME/librest/merge_requests/2 is merged.
"--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt"
];
passthru = {
updateScript = gnome3.updateScript {
packageName = pname;
attrPath = "librest";
versionPolicy = "odd-unstable";
};
};
meta = with lib; {
description = "Helper library for RESTful services";
homepage = "https://wiki.gnome.org/Projects/Librest";
license = licenses.lgpl21;
platforms = platforms.linux;
license = licenses.lgpl21Only;
platforms = platforms.unix;
maintainers = teams.gnome.members;
};
}
pkgs/development/libraries/librsvg/default.nix
+62 -27
View File
@@ -1,47 +1,79 @@
{ lib, stdenv, fetchurl, pkg-config, glib, gdk-pixbuf, pango, cairo, libxml2
, bzip2, libintl, darwin, rustc, cargo, gnome3
, vala, gobject-introspection }:
{ lib
, stdenv
, fetchurl
, pkg-config
, glib
, gdk-pixbuf
, pango
, cairo
, libxml2
, bzip2
, libintl
, ApplicationServices
, Foundation
, libobjc
, rustc
, cargo
, gnome3
, vala
, gobject-introspection
, nixosTests
}:
let
pname = "librsvg";
version = "2.50.1";
in
stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "02csvx2nzygh8kyal2qiy3y6xb7d52vszxxr37dzav704a9pkncv";
};
pname = "librsvg";
version = "2.50.5";
outputs = [ "out" "dev" "installedTests" ];
buildInputs = [ libxml2 bzip2 pango libintl ]
++ lib.optionals stdenv.isDarwin [ darwin.libobjc ];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0wlj5g1jgp93sj3rr6qspj282whz13ahnv8ca99d7zilq9s1aw1j";
};
NIX_LDFLAGS = if stdenv.isDarwin then "-lobjc" else null;
nativeBuildInputs = [
pkg-config
rustc
cargo
vala
gobject-introspection
] ++ lib.optionals stdenv.isDarwin [
ApplicationServices
Foundation
];
propagatedBuildInputs = [ glib gdk-pixbuf cairo ];
buildInputs = [
libxml2
bzip2
pango
libintl
] ++ lib.optionals stdenv.isDarwin [
libobjc
];
nativeBuildInputs = [ pkg-config rustc cargo vala gobject-introspection ]
++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
ApplicationServices
]);
propagatedBuildInputs = [
glib
gdk-pixbuf
cairo
];
configureFlags = [
"--enable-introspection"
] ++ lib.optionals (!stdenv.isDarwin) [
# Vapi does not build on MacOS.
# https://github.com/NixOS/nixpkgs/pull/117081#issuecomment-827782004
"--enable-vala"
] ++ [
"--enable-installed-tests"
"--enable-always-build-tests"
] ++ lib.optional stdenv.isDarwin "--disable-Bsymbolic";
makeFlags = [
"installed_test_metadir=$(installedTests)/share/installed-tests/RSVG"
"installed_testdir=$(installedTests)/libexec/installed-tests/RSVG"
"installed_test_metadir=${placeholder "installedTests"}/share/installed-tests/RSVG"
"installed_testdir=${placeholder "installedTests"}/libexec/installed-tests/RSVG"
];
NIX_CFLAGS_COMPILE
= lib.optionalString stdenv.isDarwin "-I${cairo.dev}/include/cairo";
doCheck = false; # all tests fail on libtool-generated rsvg-convert not being able to find coreutils
# It wants to add loaders and update the loaders.cache in gdk-pixbuf
# Patching the Makefiles to it creates rsvg specific loaders and the
@@ -63,8 +95,6 @@ stdenv.mkDerivation rec {
-i gdk-pixbuf-loader/librsvg.thumbnailer.in
'';
doCheck = false; # fails 20 of 145 tests, very likely to be buggy
# Merge gdkpixbuf and librsvg loaders
postInstall = ''
mv $GDK_PIXBUF/loaders.cache $GDK_PIXBUF/loaders.cache.tmp
@@ -75,6 +105,11 @@ stdenv.mkDerivation rec {
passthru = {
updateScript = gnome3.updateScript {
packageName = pname;
versionPolicy = "odd-unstable";
};
tests = {
installedTests = nixosTests.installed-tests.librsvg;
};
};
pkgs/development/libraries/libsigcxx/3.0.nix
+42
View File
@@ -0,0 +1,42 @@
{ stdenv
, lib
, fetchurl
, pkg-config
, meson
, ninja
, gnome3
}:
stdenv.mkDerivation rec {
pname = "libsigc++";
version = "3.0.6";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "tw7c9GEWUcVKQm4QmxcZbh+hfaCQWSpQAOLRNMA6xc4=";
};
nativeBuildInputs = [
pkg-config
meson
ninja
];
doCheck = true;
passthru = {
updateScript = gnome3.updateScript {
packageName = pname;
attrPath = "libsigcxx30";
versionPolicy = "odd-unstable";
};
};
meta = with lib; {
homepage = "https://libsigcplusplus.github.io/libsigcplusplus/";
description = "A typesafe callback system for standard C++";
license = licenses.lgpl21Plus;
maintainers = teams.gnome.members;
platforms = platforms.all;
};
}
pkgs/development/libraries/libsigcxx/default.nix
+5 -4
View File
@@ -1,15 +1,15 @@
{ lib, stdenv, fetchurl, pkg-config, gnum4, gnome3 }:
{ lib, stdenv, fetchurl, pkg-config, meson, ninja, gnome3 }:
stdenv.mkDerivation rec {
pname = "libsigc++";
version = "2.10.1";
version = "2.10.6";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "00v08km4wwzbh6vjxb21388wb9dm6g2xh14rgwabnv4c2wk5z8n9";
sha256 = "sha256-3aF23EaBvanVoqwbxVJzvdOBZit6bUnpGCZ9E+h3Ths=";
};
nativeBuildInputs = [ pkg-config gnum4 ];
nativeBuildInputs = [ pkg-config meson ninja ];
doCheck = true;
@@ -17,6 +17,7 @@ stdenv.mkDerivation rec {
updateScript = gnome3.updateScript {
packageName = pname;
attrPath = "libsigcxx";
versionPolicy = "odd-unstable";
};
};
pkgs/development/libraries/libsoup/default.nix
+1
View File
@@ -48,6 +48,7 @@ stdenv.mkDerivation rec {
propagatedUserEnvPackages = [ glib-networking.out ];
updateScript = gnome3.updateScript {
packageName = pname;
versionPolicy = "odd-unstable";
};
};
pkgs/development/libraries/libunity/default.nix
+13 -9
View File
@@ -1,4 +1,5 @@
{ lib, stdenv
{ lib
, stdenv
, fetchgit
, pkg-config
, glib
@@ -14,16 +15,24 @@
stdenv.mkDerivation {
pname = "libunity";
version = "unstable-2019-03-19";
version = "unstable-2021-02-01";
outputs = [ "out" "dev" "py" ];
# Obtained from https://git.launchpad.net/ubuntu/+source/libunity/log/
src = fetchgit {
url = "https://git.launchpad.net/ubuntu/+source/libunity";
rev = "import/7.1.4+19.04.20190319-0ubuntu1";
sha256 = "15b49v88v74q20a5c0lq867qnlz7fx20xifl6j8ha359r0zkfwzj";
rev = "import/7.1.4+19.04.20190319-5";
sha256 = "LHUs6kl1srS6Xektx+jmm4SXLR47VuQ9IhYbBxf2Wc8=";
};
patches = [
# Fix builf with latest Vala
# https://code.launchpad.net/~jtojnar/libunity/libunity
# Did not send upstream because Ubuntu is stuck on Vala 0.48.
./fix-vala.patch
];
nativeBuildInputs = [
autoreconfHook
gobject-introspection
@@ -43,11 +52,6 @@ stdenv.mkDerivation {
libdbusmenu
];
patches = [
# See: https://gitlab.gnome.org/GNOME/vala/issues/766
./fix-vala.patch
];
preConfigure = ''
intltoolize
'';
pkgs/development/libraries/libunity/fix-vala.patch
+11 -35
View File
@@ -1,36 +1,12 @@
diff -ru old/libunity/src/unity-aggregator-scope.vala libunity/src/unity-aggregator-scope.vala
--- old/libunity/src/unity-aggregator-scope.vala 1969-12-31 19:00:01.000000000 -0500
+++ libunity/src/unity-aggregator-scope.vala 2019-09-21 17:06:12.663864891 -0400
@@ -51,7 +51,7 @@
*/
public abstract int category_index_for_scope_id (string scope_id);
- public AggregatorScope (string dbus_path_, string id_, MergeMode merge_mode = AggregatorScope.MergeMode.OWNER_SCOPE, bool proxy_filter_hints = false)
+ protected AggregatorScope (string dbus_path_, string id_, MergeMode merge_mode = AggregatorScope.MergeMode.OWNER_SCOPE, bool proxy_filter_hints = false)
{
Object (dbus_path: dbus_path_, id: id_, is_master: true,
merge_mode: merge_mode, proxy_filter_hints: proxy_filter_hints);
diff -ru old/libunity/src/unity-deprecated-scope.vala libunity/src/unity-deprecated-scope.vala
--- old/libunity/src/unity-deprecated-scope.vala 1969-12-31 19:00:01.000000000 -0500
+++ libunity/src/unity-deprecated-scope.vala 2019-09-21 17:06:39.721627805 -0400
@@ -61,7 +61,7 @@
internal CategorySet _categories;
internal FilterSet _filters;
- public DeprecatedScopeBase (string dbus_path_, string id_)
+ protected DeprecatedScopeBase (string dbus_path_, string id_)
{
Object (dbus_path: dbus_path_, id: id_);
--- a/protocol/protocol-icon.vala 2013-08-27 12:53:57 +0000
+++ b/protocol/protocol-icon.vala 2021-04-13 22:34:41 +0000
@@ -185,7 +185,7 @@
}
diff -ru old/libunity/tools/preview-renderer.vala libunity/tools/preview-renderer.vala
--- old/libunity/tools/preview-renderer.vala 1969-12-31 19:00:01.000000000 -0500
+++ libunity/tools/preview-renderer.vala 2019-09-21 17:09:16.201522110 -0400
@@ -63,7 +63,7 @@
*/
public abstract class GridRenderer: PreviewRenderer
{
- public GridRenderer()
+ protected GridRenderer()
{
Object();
}
/* Added to GIcon interface in 2.37 */
- private Variant serialize ()
+ private Variant? serialize ()
{
Variant? ret = null;
return ret;
pkgs/development/libraries/libvirt-glib/default.nix
+35 -9
View File
@@ -1,21 +1,47 @@
{ lib, stdenv, fetchurl, pkg-config, gobject-introspection, intltool, vala
, libcap_ng, libvirt, libxml2
{ lib
, stdenv
, fetchurl
, meson
, ninja
, pkg-config
, gobject-introspection
, gettext
, gtk-doc
, docbook-xsl-nons
, vala
, libcap_ng
, libvirt
, libxml2
}:
stdenv.mkDerivation rec {
name = "libvirt-glib-3.0.0";
name = "libvirt-glib-4.0.0";
outputs = [ "out" "dev" ];
outputs = [ "out" "dev" "devdoc" ];
src = fetchurl {
url = "https://libvirt.org/sources/glib/${name}.tar.gz";
sha256 = "1zpbv4ninc57c9rw4zmmkvvqn7154iv1qfr20kyxn8xplalqrzvz";
url = "https://libvirt.org/sources/glib/${name}.tar.xz";
sha256 = "hCP3Bp2qR2MHMh0cEeLswoU0DNMsqfwFIHdihD7erL0=";
};
nativeBuildInputs = [ pkg-config intltool vala gobject-introspection ];
buildInputs = [ libcap_ng libvirt libxml2 gobject-introspection ];
nativeBuildInputs = [
meson
ninja
pkg-config
gettext
gtk-doc
docbook-xsl-nons
vala
gobject-introspection
];
buildInputs = [
libcap_ng
libvirt
libxml2
gobject-introspection
];
enableParallelBuilding = true;
strictDeps = true;
meta = with lib; {
pkgs/development/libraries/libwnck/3.x.nix
+1
View File
@@ -63,6 +63,7 @@ stdenv.mkDerivation rec {
updateScript = gnome3.updateScript {
packageName = pname;
attrPath = "${pname}${lib.versions.major version}";
versionPolicy = "odd-unstable";
};
};
pkgs/development/libraries/libxmlxx/default.nix
+1
View File
@@ -18,6 +18,7 @@ stdenv.mkDerivation rec {
passthru = {
updateScript = gnome3.updateScript {
packageName = pname;
versionPolicy = "odd-unstable";
};
};
pkgs/development/libraries/libzapojit/default.nix
+1
View File
@@ -17,6 +17,7 @@ stdenv.mkDerivation rec {
passthru = {
updateScript = gnome3.updateScript {
packageName = pname;
versionPolicy = "odd-unstable";
};
};
pkgs/development/libraries/pango/default.nix
+3 -11
View File
@@ -1,7 +1,6 @@
{ lib
, stdenv
, fetchurl
, fetchpatch
, pkg-config
, cairo
, harfbuzz
@@ -22,23 +21,15 @@
stdenv.mkDerivation rec {
pname = "pango";
version = "1.48.3";
version = "1.48.4";
outputs = [ "bin" "out" "dev" "devdoc" ];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0ijbkcs6217ygzphlpi0vajxkccifdbsl0jdjpy8wz11h9f19sin";
sha256 = "0ym3cvajy2asapj8xbhfpy05rak79afrhi32hiss0w900vxi72a1";
};
patches = [
# Install developer documentation.
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/pango/commit/a2f35860115e8cd44f07d5158e2df059e8163a08.patch";
sha256 = "hN7O4DBk4A+TmBl6DGx6RHni5qRBg6akdjv9o3iWKDQ=";
})
];
nativeBuildInputs = [
meson ninja
glib # for glib-mkenum
@@ -90,6 +81,7 @@ stdenv.mkDerivation rec {
passthru = {
updateScript = gnome3.updateScript {
packageName = pname;
versionPolicy = "odd-unstable";
};
};
pkgs/development/libraries/pangomm/2.48.nix
+65
View File
@@ -0,0 +1,65 @@
{ stdenv
, lib
, fetchurl
, pkg-config
, meson
, ninja
, python3
, pango
, glibmm_2_68
, cairomm_1_16
, gnome3
, ApplicationServices
}:
stdenv.mkDerivation rec {
pname = "pangomm";
version= "2.48.0";
outputs = [ "out" "dev" ];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "sha256-ng7UdMM/jCACyp4rYcoNHz2OQJ4J6Z9NjBnur8z1W3g=";
};
nativeBuildInputs = [
pkg-config
meson
ninja
python3
] ++ lib.optional stdenv.isDarwin [
ApplicationServices
];
propagatedBuildInputs = [
pango
glibmm_2_68
cairomm_1_16
];
doCheck = true;
passthru = {
updateScript = gnome3.updateScript {
packageName = pname;
attrPath = "${pname}_2_48";
versionPolicy = "odd-unstable";
};
};
meta = with lib; {
description = "C++ interface to the Pango text rendering library";
longDescription = ''
Pango is a library for laying out and rendering of text, with an
emphasis on internationalization. Pango can be used anywhere
that text layout is needed, though most of the work on Pango so
far has been done in the context of the GTK widget toolkit.
Pango forms the core of text and font handling for GTK.
'';
homepage = "https://www.pango.org/";
license = licenses.lgpl21Plus;
maintainers = teams.gnome.members ++ (with maintainers; [ lovek323 raskin ]);
platforms = platforms.unix;
};
}
pkgs/development/libraries/pangomm/default.nix
+1
View File
@@ -22,6 +22,7 @@ stdenv.mkDerivation rec {
passthru = {
updateScript = gnome3.updateScript {
packageName = pname;
versionPolicy = "odd-unstable";
};
};
pkgs/development/libraries/poppler/default.nix
+15 -2
View File
@@ -10,7 +10,7 @@
let
mkFlag = optset: flag: "-DENABLE_${flag}=${if optset then "on" else "off"}";
in
stdenv.mkDerivation rec {
stdenv.mkDerivation (rec {
name = "poppler-${suffix}-${version}";
version = "21.02.0"; # beware: updates often break cups-filters build, check texlive and scribusUnstable too!
@@ -63,4 +63,17 @@ stdenv.mkDerivation rec {
platforms = platforms.all;
maintainers = with maintainers; [ ttuegel ] ++ teams.freedesktop.members;
};
}
} // lib.optionalAttrs stdenv.isDarwin {
patches = [
# Fix build due to improperly used volatile in poppler-glib.
# https://gitlab.freedesktop.org/poppler/poppler/merge_requests/836
(fetchpatch {
url = "https://gitlab.freedesktop.org/poppler/poppler/commit/47de887d7658cfd68df44b3acf710971054f957b.patch";
sha256 = "uvYibBn2fOEqdotxK0Wpf8KhGYZXrpHdmS4jjlRNCj8=";
})
(fetchpatch {
url = "https://gitlab.freedesktop.org/poppler/poppler/commit/bdd110b45a38e8a4f80f522892e4c4a9e432abd5.patch";
sha256 = "WDUYXX6v5zk7tusz7DGBP58yFzgEvoBlNSLbfk7+QTc=";
})
];
})
pkgs/development/libraries/rarian/default.nix
-6
View File
@@ -15,12 +15,6 @@ in stdenv.mkDerivation rec {
++ (with perlPackages; [ perl XMLParser ]);
configureFlags = [ "--with-xml-catalog=${docbook_xml_dtd_42}/xml/dtd/docbook/docbook.cat" ];
passthru = {
updateScript = gnome3.updateScript {
packageName = pname;
};
};
meta = with lib; {
description = "Documentation metadata library based on the proposed Freedesktop.org spec";
homepage = "https://rarian.freedesktop.org/";
pkgs/development/libraries/speechd/default.nix
+8
View File
@@ -2,6 +2,7 @@
, substituteAll
, pkg-config
, fetchurl
, fetchpatch
, python3Packages
, gettext
, itstool
@@ -51,6 +52,13 @@ in stdenv.mkDerivation rec {
src = ./fix-paths.patch;
utillinux = util-linux;
})
# Fix build with Glib 2.68
# https://github.com/brailcom/speechd/pull/462
(fetchpatch {
url = "https://github.com/brailcom/speechd/commit/a2faab416e42cbdf3d73f98578a89eb7a235e25a.patch";
sha256 = "8Q7tUdKKBBtgXZZnj59OcJOkrCNeBR9gkBjhKlpW0hQ=";
})
];
nativeBuildInputs = [
pkgs/development/libraries/template-glib/default.nix
+1
View File
@@ -23,6 +23,7 @@ stdenv.mkDerivation {
passthru = {
updateScript = gnome3.updateScript {
packageName = pname;
versionPolicy = "odd-unstable";
};
};
pkgs/development/libraries/tepl/default.nix
+6 -3
View File
@@ -13,13 +13,13 @@
stdenv.mkDerivation rec {
pname = "tepl";
version = "5.0.1";
version = "6.00.0";
outputs = [ "out" "dev" ];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "sSdJZ2CfUkSEs4d1+p7LKWxtZhaqvQUvKGM5oomRKAQ=";
sha256 = "0qvs7s86gqyyrzi0r5fbrj8zczlgv8xhdjswgbgc1afwjnl9fqx8";
};
nativeBuildInputs = [
@@ -46,7 +46,10 @@ stdenv.mkDerivation rec {
# correctly installed or GVfs metadata are not supported on this platform. In
# the latter case, you should configure Tepl with --disable-gvfs-metadata.
passthru.updateScript = gnome3.updateScript { packageName = pname; };
passthru.updateScript = gnome3.updateScript {
packageName = pname;
versionPolicy = "odd-unstable";
};
meta = with lib; {
homepage = "https://wiki.gnome.org/Projects/Tepl";
pkgs/development/libraries/totem-pl-parser/default.nix
+1
View File
@@ -12,6 +12,7 @@ stdenv.mkDerivation rec {
passthru = {
updateScript = gnome3.updateScript {
packageName = pname;
versionPolicy = "odd-unstable";
};
};
pkgs/development/libraries/tracker-miners/default.nix
+2 -2
View File
@@ -48,11 +48,11 @@
stdenv.mkDerivation rec {
pname = "tracker-miners";
version = "3.0.4";
version = "3.1.1";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "sha256-E877xx1S93RvPTfQQdjFvBM2pA/13ZK1Nw6GUMJqiY4=";
sha256 = "sha256-5NNhNRsVbyhipSRBX76/BTnHgc2HxmKWYvAmW0gDuLg=";
};
nativeBuildInputs = [
pkgs/development/libraries/tracker/default.nix
+20 -12
View File
@@ -1,5 +1,6 @@
{ lib, stdenv
, fetchurl
, fetchpatch
, gettext
, meson
, ninja
@@ -27,15 +28,15 @@
, substituteAll
}:
stdenv.mkDerivation (rec {
stdenv.mkDerivation rec {
pname = "tracker";
version = "3.0.3";
version = "3.1.1";
outputs = [ "out" "dev" "devdoc" ];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "sha256-b1yEqzvh7aUgUBsq7XIhYWoM8VKRDFN3V7U4vAXv/KM=";
sha256 = "sha256-Q3bi6YRUBm9E96JC5FuZs7/kwDtn+rGauw7Vhsp0iuc=";
};
patches = [
@@ -43,6 +44,17 @@ stdenv.mkDerivation (rec {
src = ./fix-paths.patch;
inherit asciidoc;
})
# Add missing build target dependencies to fix parallel building of docs.
# TODO: Upstream this.
./fix-docs.patch
# Fix 32bit datetime issue, use this upstream patch until 3.1.2 lands
# https://gitlab.gnome.org/GNOME/tracker/-/merge_requests/401
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/tracker/merge_requests/401.patch";
sha256 = "QEf+ciGkkCzanmtGO0aig6nAxd+NxjvuNi4RbNOwZEA=";
})
];
nativeBuildInputs = [
@@ -74,22 +86,23 @@ stdenv.mkDerivation (rec {
libstemmer
];
checkInputs = [
python3.pkgs.pygobject3
checkInputs = with python3.pkgs; [
pygobject3
tappy
];
mesonFlags = [
"-Ddocs=true"
];
# https://gitlab.gnome.org/GNOME/tracker/-/issues/292#note_1075369
doCheck = !stdenv.isi686;
doCheck = true;
postPatch = ''
patchShebangs utils/g-ir-merge/g-ir-merge
patchShebangs utils/data-generators/cc/generate
patchShebangs tests/functional-tests/test-runner.sh.in
patchShebangs tests/functional-tests/*.py
patchShebangs examples/python/endpoint.py
'';
preCheck = ''
@@ -134,8 +147,3 @@ stdenv.mkDerivation (rec {
platforms = platforms.linux;
};
}
// {
# TMP: fatal error: libtracker-sparql/tracker-sparql-enum-types.h: No such file or directory
enableParallelBuilding = false;
}
)
pkgs/development/libraries/tracker/fix-docs.patch
+28
View File
@@ -0,0 +1,28 @@
diff --git a/docs/reference/libtracker-sparql/examples/meson.build b/docs/reference/libtracker-sparql/examples/meson.build
index 1cb1d9f3f..313c72345 100644
--- a/docs/reference/libtracker-sparql/examples/meson.build
+++ b/docs/reference/libtracker-sparql/examples/meson.build
@@ -1,20 +1,20 @@
executable(
'readonly-example',
'readonly-example.c',
- dependencies: tracker_sparql_dep,
+ dependencies: [tracker_common_dep, tracker_sparql_dep],
build_by_default: true
)
executable(
'writeonly-example',
'writeonly-example.c',
- dependencies: tracker_sparql_dep,
+ dependencies: [tracker_common_dep, tracker_sparql_dep],
build_by_default: true
)
executable(
'writeonly-with-blank-nodes-example',
'writeonly-with-blank-nodes-example.c',
- dependencies: tracker_sparql_dep,
+ dependencies: [tracker_common_dep, tracker_sparql_dep],
build_by_default: true
)
pkgs/development/libraries/umockdev/default.nix
+27 -16
View File
@@ -1,6 +1,8 @@
{ lib, stdenv
, docbook_xsl
{ stdenv
, lib
, docbook-xsl-nons
, fetchurl
, fetchpatch
, glib
, gobject-introspection
, gtk-doc
@@ -19,21 +21,23 @@ stdenv.mkDerivation rec {
pname = "umockdev";
version = "0.15.4";
outputs = [ "bin" "out" "dev" "doc" ];
outputs = [ "bin" "out" "dev" "devdoc" ];
src = fetchurl {
url = "https://github.com/martinpitt/umockdev/releases/download/${version}/${pname}-${version}.tar.xz";
sha256 = "09k8jwvsphd97hcagf0zaf0hwzlzq2r8jfgbmvj55k7ylrg8hjxg";
};
mesonFlags = [
"-Dgtk_doc=true"
patches = [
# Fix build with Vala 0.52
(fetchpatch {
url = "https://github.com/martinpitt/umockdev/commit/a236f0b55fbb6ff50a6429da9d404703d6637d94.patch";
sha256 = "sZs9Ove1r7te/a9vmWUmFetLVhyzhHmx7ijhkK/2S5o=";
})
];
buildInputs = [ glib systemd libgudev ];
nativeBuildInputs = [
docbook_xsl
docbook-xsl-nons
gobject-introspection
gtk-doc
meson
@@ -42,20 +46,27 @@ stdenv.mkDerivation rec {
vala
];
checkInputs = [ python3 which usbutils ];
buildInputs = [
glib
systemd
libgudev
];
enableParallelBuilding = true;
checkInputs = [
python3
which
usbutils
];
mesonFlags = [
"-Dgtk_doc=true"
];
doCheck = true;
postInstall = ''
mkdir -p $doc/share/doc/umockdev/
mv docs/reference $doc/share/doc/umockdev/
'';
meta = with lib; {
description = "Mock hardware devices for creating unit tests";
license = licenses.lgpl2;
license = licenses.lgpl21Plus;
maintainers = with maintainers; [ flokli ];
platforms = with platforms; linux;
};
pkgs/development/libraries/vte/default.nix
+24 -17
View File
@@ -11,6 +11,7 @@
, gtk3
, gobject-introspection
, vala
, python3
, libxml2
, gnutls
, gperf
@@ -24,18 +25,25 @@
stdenv.mkDerivation rec {
pname = "vte";
version = "0.62.2";
version = "0.64.1";
outputs = [ "out" "dev" ];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "sha256-sDALvPDALfWBKhCjy45P/3I7q5LAjJegqQwWfPVDr/A=";
sha256 = "sha256-EvtBqf+OA8XxcRtGVgkQpLmzECrsPp52Cc7vTfqYqio=";
};
passthru = {
updateScript = gnome3.updateScript { packageName = pname; };
};
patches = [
# VTE needs a small patch to work with musl:
# https://gitlab.gnome.org/GNOME/vte/issues/72
# Taken from https://git.alpinelinux.org/aports/tree/community/vte3
(fetchpatch {
name = "0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch";
url = "https://git.alpinelinux.org/aports/plain/community/vte3/fix-W_EXITCODE.patch?id=4d35c076ce77bfac7655f60c4c3e4c86933ab7dd";
sha256 = "FkVyhsM0mRUzZmS2Gh172oqwcfXv6PyD6IEgjBhy2uU=";
})
];
nativeBuildInputs = [
gettext
@@ -46,6 +54,7 @@ stdenv.mkDerivation rec {
ninja
pkg-config
vala
python3
];
buildInputs = [
@@ -64,22 +73,20 @@ stdenv.mkDerivation rec {
pango
];
patches =
# VTE needs a small patch to work with musl:
# https://gitlab.gnome.org/GNOME/vte/issues/72
lib.optional
stdenv.hostPlatform.isMusl
(fetchpatch {
name = "0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch";
url = "https://gitlab.gnome.org/GNOME/vte/uploads/c334f767f5d605e0f30ecaa2a0e4d226/0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch";
sha256 = "1ii9db9i5l3fy2alxz7bjfsgjs3lappnlx339dvxbi2141zknf5r";
});
postPatch = ''
patchShebangs perf/*
patchShebangs src/box_drawing_generate.sh
patchShebangs src/parser-seq.py
patchShebangs src/modes.py
'';
passthru = {
updateScript = gnome3.updateScript {
packageName = pname;
versionPolicy = "odd-unstable";
};
};
meta = with lib; {
homepage = "https://www.gnome.org/";
description = "A library implementing a terminal emulator widget for GTK";
@@ -91,7 +98,7 @@ stdenv.mkDerivation rec {
character set conversion, as well as emulating any terminal known to
the system's terminfo database.
'';
license = licenses.lgpl2;
license = licenses.lgpl3Plus;
maintainers = with maintainers; [ astsmtl antono lethalman ] ++ teams.gnome.members;
platforms = platforms.unix;
};
pkgs/development/libraries/webkitgtk/default.nix
+20 -13
View File
@@ -57,8 +57,6 @@
assert enableGeoLocation -> geoclue2 != null;
with lib;
stdenv.mkDerivation rec {
pname = "webkitgtk";
version = "2.32.0";
@@ -72,7 +70,7 @@ stdenv.mkDerivation rec {
sha256 = "1w3b0w8izp0i070grhv19j631sdcd0mcqnjnax13k8mdx7dg8zcx";
};
patches = optionals stdenv.isLinux [
patches = lib.optionals stdenv.isLinux [
(substituteAll {
src = ./fix-bubblewrap-paths.patch;
inherit (builtins) storeDir;
@@ -85,7 +83,7 @@ stdenv.mkDerivation rec {
# pick up the wrong gettext. TODO: Find a better solution for
# this, maybe make cmake not look up executables in
# CMAKE_PREFIX_PATH.
cmakeFlags+=" -DCMAKE_IGNORE_PATH=${getBin gettext}/bin"
cmakeFlags+=" -DCMAKE_IGNORE_PATH=${lib.getBin gettext}/bin"
'';
nativeBuildInputs = [
@@ -118,7 +116,9 @@ stdenv.mkDerivation rec {
libgcrypt
libidn
libintl
] ++ lib.optionals stdenv.isLinux [
libmanette
] ++ [
libnotify
libpthreadstubs
libsecret
@@ -138,16 +138,16 @@ stdenv.mkDerivation rec {
libXdmcp
libXt
libXtst
]) ++ optionals stdenv.isDarwin [
]) ++ lib.optionals stdenv.isDarwin [
libedit
readline
] ++ optionals stdenv.isLinux [
] ++ lib.optionals stdenv.isLinux [
bubblewrap
libseccomp
systemd
wayland
xdg-dbus-proxy
] ++ optional enableGeoLocation geoclue2;
] ++ lib.optional enableGeoLocation geoclue2;
propagatedBuildInputs = [
gtk3
@@ -159,27 +159,34 @@ stdenv.mkDerivation rec {
"-DPORT=GTK"
"-DUSE_LIBHYPHEN=OFF"
"-DUSE_WPE_RENDERER=OFF"
] ++ optionals stdenv.isDarwin [
"-DENABLE_GRAPHICS_CONTEXT_3D=OFF"
] ++ lib.optionals stdenv.isDarwin [
"-DENABLE_GAMEPAD=OFF"
"-DENABLE_GTKDOC=OFF"
"-DENABLE_MINIBROWSER=OFF"
"-DENABLE_OPENGL=OFF"
"-DENABLE_QUARTZ_TARGET=ON"
"-DENABLE_VIDEO=ON"
"-DENABLE_WEBGL=OFF"
"-DENABLE_WEB_AUDIO=OFF"
"-DENABLE_X11_TARGET=OFF"
"-DUSE_ACCELERATE=0"
"-DUSE_APPLE_ICU=OFF"
"-DUSE_OPENGL_OR_ES=OFF"
"-DUSE_SYSTEM_MALLOC=ON"
] ++ optional (stdenv.isLinux && enableGLES) "-DENABLE_GLES2=ON";
] ++ lib.optionals (!stdenv.isLinux) [
"-DUSE_SYSTEMD=OFF"
] ++ lib.optional (stdenv.isLinux && enableGLES) "-DENABLE_GLES2=ON";
postPatch = ''
patchShebangs .
'' + lib.optionalString stdenv.isDarwin ''
# It needs malloc_good_size.
sed 22i'#include <malloc/malloc.h>' -i Source/WTF/wtf/FastMalloc.h
# <CommonCrypto/CommonRandom.h> needs CCCryptorStatus.
sed 43i'#include <CommonCrypto/CommonCryptor.h>' -i Source/WTF/wtf/RandomDevice.cpp
'';
requiredSystemFeatures = [ "big-parallel" ];
meta = {
meta = with lib; {
description = "Web content rendering engine, GTK port";
homepage = "https://webkitgtk.org/";
license = licenses.bsd2;
pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix
+2 -2
View File
@@ -32,10 +32,10 @@ stdenv.mkDerivation rec {
buildInputs = [
glib
gsettings-desktop-schemas
gsettings-desktop-schemas # settings exposed by settings portal
gtk3
gnome3.gnome-desktop
gnome3.gnome-settings-daemon # schemas needed for settings api (fonts, etc)
gnome3.gnome-settings-daemon # schemas needed for settings api (mostly useless now that fonts were moved to g-d-s)
];
meta = with lib; {
pkgs/development/libraries/zeitgeist/default.nix
+5 -5
View File
@@ -20,7 +20,7 @@
stdenv.mkDerivation rec {
pname = "zeitgeist";
version = "1.0.2";
version = "1.0.3";
outputs = [ "out" "lib" "dev" "man" ] ++ lib.optional pythonSupport "py";
@@ -29,14 +29,14 @@ stdenv.mkDerivation rec {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "0ig3d3j1n0ghaxsgfww6g2hhcdwx8cljwwfmp9jk1nrvkxd6rnmv";
sha256 = "0y6fyzxl5np4yskcxibd0p03h619w9ir907nhf40h02y0pk1kgkp";
};
patches = [
# Fix build with gettext 0.20
# Fix build with Vala 0.52
(fetchpatch {
url = "https://gitlab.freedesktop.org/zeitgeist/zeitgeist/commit/b5c00e80189fd59a059a95c4e276728a2492cb89.patch";
sha256 = "1r7f7j3l2p6xlzxajihgx8bzbc2sxcb9spc9pi26rz9bwmngdyq7";
url = "https://gitlab.freedesktop.org/zeitgeist/zeitgeist/commit/64ac3a6f94cd299e5e14945dc31b48f009dec152.patch";
sha256 = "Dw1kNE3JoFdmgcQ0eFoFLYvmxlPjXNj56Jkn2meINz4=";
})
];