BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #70344 from worldofpeace/fix-some-stuff

Browse source 
Fixup some glib/gtk vala FTBFS
This commit is contained in:
worldofpeace 2019-10-03 22:13:40 +00:00 committed by GitHub
commit 6dbb7b2437
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 39 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
pkgs/applications/misc/font-manager/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, meson, ninja, gettext, python3,
{ stdenv, fetchFromGitHub, meson, ninja, gettext, python3, fetchpatch,
pkgconfig, libxml2, json-glib , sqlite, itstool, librsvg,
vala, gtk3, gnome3, desktop-file-utils, wrapGAppsHook, gobject-introspection
}:
@ -42,6 +42,15 @@ stdenv.mkDerivation rec {
"-Ddisable_pycompile=true"
];
patches = [
# fix build with Vala 0.46
(fetchpatch {
url = "https://github.com/FontManager/font-manager/commit/c73b40de11f376f4515a0edfe97fb3721a264b35.patch";
sha256 = "0lacwsifgvda2r3z6j2a0svdqr6mgav7zkvih35xa8155y8wfpnw";
excludes = [ "fedora/font-manager.spec" ];
})
];
postPatch = ''
chmod +x meson_post_install.py
patchShebangs meson_post_install.py
@ -60,7 +69,6 @@ stdenv.mkDerivation rec {
Font Manager is NOT a professional-grade font management solution.
'';
license = licenses.gpl3;
repositories.git = https://github.com/FontManager/master;
platforms = platforms.unix;
maintainers = [ maintainers.romildo ];
};

3
pkgs/applications/misc/grip/default.nix
View file

@ -15,6 +15,9 @@ stdenv.mkDerivation rec {
hardeningDisable = [ "format" ];
# glib-2.62 deprecations
NIX_CFLAGS_COMPILE = [ "-DGLIB_DISABLE_DEPRECATION_WARNINGS" ];
meta = {
description = "GTK-based audio CD player/ripper";
homepage = http://nostatic.org/grip;

3
pkgs/applications/misc/gxneur/default.nix
View file

@ -8,7 +8,8 @@ stdenv.mkDerivation {
sha256 = "0avmhdcj0hpr55fc0iih8fjykmdhn34c8mwdnqvl8jh4nhxxchxr";
};
NIX_CFLAGS_COMPILE = "-Wno-deprecated-declarations";
# glib-2.62 deprecations
NIX_CFLAGS_COMPILE = [ "-DGLIB_DISABLE_DEPRECATION_WARNINGS" ];
nativeBuildInputs = [ pkgconfig intltool ];
buildInputs = [

18
pkgs/applications/misc/pdfpc/default.nix
View file

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, cmake, makeWrapper, pkgconfig, vala, gtk3, libgee
, poppler, libpthreadstubs, gstreamer, gst-plugins-base, librsvg, pcre, gobject-introspection }:
{ stdenv, fetchFromGitHub, cmake, pkgconfig, vala, gtk3, libgee, fetchpatch
, poppler, libpthreadstubs, gstreamer, gst-plugins-base, librsvg, pcre, gobject-introspection, wrapGAppsHook }:
stdenv.mkDerivation rec {
name = "${product}-${version}";
@ -17,16 +17,20 @@ stdenv.mkDerivation rec {
cmake pkgconfig vala
# For setup hook
gobject-introspection
wrapGAppsHook
];
buildInputs = [ gstreamer gst-plugins-base gtk3 libgee poppler
libpthreadstubs makeWrapper librsvg pcre ];
libpthreadstubs librsvg pcre ];
cmakeFlags = stdenv.lib.optionalString stdenv.isDarwin "-DMOVIES=OFF";
postInstall = ''
wrapProgram $out/bin/pdfpc \
--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE"
'';
patches = [
# Fix build vala 0.46
(fetchpatch {
url = "https://github.com/pdfpc/pdfpc/commit/bbc16b97ecbdcdd22c2dc827a5c0e8b569073312.patch";
sha256 = "0wi1rqcvg65cxnxvmvavcvghqyksnpijq1p91m57jaby3hb0pdcy";
})
];
meta = with stdenv.lib; {
description = "A presenter console with multi-monitor support for PDF files";

4
pkgs/desktops/deepin/deepin-terminal/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, pkgconfig, cmake, ninja, vala,
{ stdenv, fetchFromGitHub, pkgconfig, cmake, ninja, vala_0_44,
gettext, at-spi2-core, dbus, epoxy, expect, gtk3, json-glib,
libXdmcp, libgee, libpthreadstubs, librsvg, libsecret, libtasn1,
libxcb, libxkbcommon, p11-kit, pcre, vte, wnck, libselinux, gnutls, pcre2,
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
pkgconfig
cmake
ninja
vala
vala_0_44 # xcb.vapi:411.3-411.48: error: missing return statement at end of subroutine body
gettext
libselinux libsepol utillinux # required by gio
deepin.setupHook

10
pkgs/desktops/lxqt/libfm-qt/default.nix
View file

@ -5,14 +5,14 @@
}:
mkDerivation rec {
pname = "libfm-qt";
version = "0.14.1";
pname = "libfm-qt-unstable";
version = "2019-09-22";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
sha256 = "00rn5i16h659zyp1dx213nc3jz7rx9phiw71zf6nspxzxsb8w2sc";
repo = "libfm-qt";
rev = "7c94e9efb996df0602f1f2b34b0216ba9b6df498";
sha256 = "1fnli2kh7n4hxmqwcb1n06lyk67d9a2fx6z70gas5jzym7r2h5vw";
};
nativeBuildInputs = [

8
pkgs/desktops/lxqt/lxqt-archiver/default.nix
View file

@ -3,13 +3,13 @@
mkDerivation rec {
# pname = "lxqt-archiver";
pname = "lxqt-archiver-unstable";
version = "2019-09-15";
version = "2019-09-25";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = "1e657b6a3e68c32f042d583872eca39a5d4b820f";
sha256 = "1vc9pzxrhznp65gdkzj3fzzivfqy712mwcxp3r25ar59d54alfpj";
repo = "lxqt-archiver";
rev = "62501255434b2ba6a8fd043a5af13dc0df038a5b";
sha256 = "1af58k68karmnay7xgngzlmcgkmvx6hay5m1xbl5id9hh16n20in";
};
nativeBuildInputs = [

4
pkgs/tools/misc/birdfont/default.nix
View file

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, python3, xmlbird,
cairo, gdk-pixbuf, libgee, glib, gtk3, webkitgtk, libnotify, sqlite, vala,
cairo, gdk-pixbuf, libgee, glib, gtk3, webkitgtk, libnotify, sqlite, vala_0_44,
gobject-introspection, gsettings-desktop-schemas, wrapGAppsHook }:
stdenv.mkDerivation rec {
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "0dr2cnvq30wak0j2k8089is7fvhw0ppwkfrrw1m649s2b95wav3q";
};
nativeBuildInputs = [ python3 pkgconfig vala gobject-introspection wrapGAppsHook ];
nativeBuildInputs = [ python3 pkgconfig vala_0_44 gobject-introspection wrapGAppsHook ];
buildInputs = [ xmlbird libgee cairo gdk-pixbuf glib gtk3 webkitgtk libnotify sqlite gsettings-desktop-schemas ];
postPatch = "patchShebangs .";