cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #124752 from dotlambda/libadwaita-1.0.0-alpha.1

Browse source 
libadwaita: unstable-2021-05-01 -> 1.0.0-alpha.1
This commit is contained in:
Robert Schütz 2021-06-12 22:18:54 +02:00 committed by GitHub
commit e3848b9312
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 24 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
pkgs/applications/audio/mousai/default.nix
View file

@ -1,6 +1,7 @@
{ lib { lib
, python3 , python3
, fetchFromGitHub , fetchFromGitHub
, fetchpatch
, appstream-glib , appstream-glib
, desktop-file-utils , desktop-file-utils
, gettext , gettext
@ -29,6 +30,14 @@ python3.pkgs.buildPythonApplication rec {
sha256 = "sha256-AfR5n1dIm9X5OoPiikQEhHBFQq0rmQH4h7cCJ2yXoXI="; sha256 = "sha256-AfR5n1dIm9X5OoPiikQEhHBFQq0rmQH4h7cCJ2yXoXI=";
}; };
patches = [
(fetchpatch {
name = "fix-ABI-breakage-from-libadwaita.patch";
url = "https://github.com/SeaDve/Mousai/commit/e3db2d9d1949300f49399209b56d667746e539df.patch";
sha256 = "078kvmyhw4jd1m2npai0yl00lwh47jys2n03pkgxp6jf873y83vs";
})
];
postPatch = '' postPatch = ''
patchShebangs build-aux/meson patchShebangs build-aux/meson
''; '';

1
pkgs/applications/misc/authenticator/default.nix
View file

@ -91,6 +91,7 @@ stdenv.mkDerivation rec {
]; ];
meta = with lib; { meta = with lib; {
broken = true; # https://gitlab.gnome.org/World/Authenticator/-/issues/271
description = "Two-factor authentication code generator for GNOME"; description = "Two-factor authentication code generator for GNOME";
homepage = "https://gitlab.gnome.org/World/Authenticator"; homepage = "https://gitlab.gnome.org/World/Authenticator";
license = licenses.gpl3Plus; license = licenses.gpl3Plus;

18
pkgs/development/libraries/libadwaita/default.nix
View file

@ -2,35 +2,40 @@
, stdenv , stdenv
, fetchFromGitLab , fetchFromGitLab
, docbook-xsl-nons , docbook-xsl-nons
, gi-docgen
, gtk-doc , gtk-doc
, libxml2
, meson , meson
, ninja , ninja
, pkg-config , pkg-config
, sassc , sassc
, vala , vala
, gobject-introspection , gobject-introspection
, fribidi
, gtk4 , gtk4
, xvfb-run , xvfb-run
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libadwaita"; pname = "libadwaita";
version = "unstable-2021-05-01"; version = "1.0.0-alpha.1";
outputs = [ "out" "dev" "devdoc" ]; outputs = [ "out" "dev" "devdoc" ];
outputBin = "dev"; outputBin = "devdoc"; # demo app
src = fetchFromGitLab { src = fetchFromGitLab {
domain = "gitlab.gnome.org"; domain = "gitlab.gnome.org";
owner = "GNOME"; owner = "GNOME";
repo = "libadwaita"; repo = "libadwaita";
rev = "8d66b987a19979d9d7b85dacc6bad5ce0c8743fe"; rev = version;
sha256 = "0i3wav6jsyi4w4i2r1rad769m5y5s9djj4zqb7dfyh0bad24ba3q"; sha256 = "1v52md62kaqykv8b6kxxbxwnbdzlda4ir7n5wh2iizadcailyw7p";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
docbook-xsl-nons docbook-xsl-nons
gi-docgen
gtk-doc gtk-doc
libxml2 # for xmllint
meson meson
ninja ninja
pkg-config pkg-config
@ -43,6 +48,7 @@ stdenv.mkDerivation rec {
]; ];
buildInputs = [ buildInputs = [
fribidi
gobject-introspection gobject-introspection
gtk4 gtk4
]; ];
@ -57,6 +63,10 @@ stdenv.mkDerivation rec {
xvfb-run meson test xvfb-run meson test
''; '';
postInstall = ''
mv $out/share/{doc,gtk-doc}
'';
meta = with lib; { meta = with lib; {
description = "Library to help with developing UI for mobile devices using GTK/GNOME"; description = "Library to help with developing UI for mobile devices using GTK/GNOME";
homepage = "https://gitlab.gnome.org/GNOME/libadwaita"; homepage = "https://gitlab.gnome.org/GNOME/libadwaita";