pyrox.dev / nixpkgs
lol
fork atom

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

libadwaita: unstable-2021-05-01 -> 1.0.0-alpha.1

authored by

Robert Schütz and committed by
GitHub e3848b93 fb82ddc3

+24 -4
unified split
+9
pkgs/applications/audio/mousai/default.nix
··· 1 1 { lib 2 2 , python3 3 3 , fetchFromGitHub 4 + , fetchpatch 4 5 , appstream-glib 5 6 , desktop-file-utils 6 7 , gettext ··· 28 29 rev = "v${version}"; 29 30 sha256 = "sha256-AfR5n1dIm9X5OoPiikQEhHBFQq0rmQH4h7cCJ2yXoXI="; 30 31 }; 32 + 33 + patches = [ 34 + (fetchpatch { 35 + name = "fix-ABI-breakage-from-libadwaita.patch"; 36 + url = "https://github.com/SeaDve/Mousai/commit/e3db2d9d1949300f49399209b56d667746e539df.patch"; 37 + sha256 = "078kvmyhw4jd1m2npai0yl00lwh47jys2n03pkgxp6jf873y83vs"; 38 + }) 39 + ]; 31 40 32 41 postPatch = '' 33 42 patchShebangs build-aux/meson
+1
pkgs/applications/misc/authenticator/default.nix
··· 91 91 ]; 92 92 93 93 meta = with lib; { 94 + broken = true; # https://gitlab.gnome.org/World/Authenticator/-/issues/271 94 95 description = "Two-factor authentication code generator for GNOME"; 95 96 homepage = "https://gitlab.gnome.org/World/Authenticator"; 96 97 license = licenses.gpl3Plus;
+14 -4
pkgs/development/libraries/libadwaita/default.nix
··· 2 2 , stdenv 3 3 , fetchFromGitLab 4 4 , docbook-xsl-nons 5 + , gi-docgen 5 6 , gtk-doc 7 + , libxml2 6 8 , meson 7 9 , ninja 8 10 , pkg-config 9 11 , sassc 10 12 , vala 11 13 , gobject-introspection 14 + , fribidi 12 15 , gtk4 13 16 , xvfb-run 14 17 }: 15 18 16 19 stdenv.mkDerivation rec { 17 20 pname = "libadwaita"; 18 - version = "unstable-2021-05-01"; 21 + version = "1.0.0-alpha.1"; 19 22 20 23 outputs = [ "out" "dev" "devdoc" ]; 21 - outputBin = "dev"; 24 + outputBin = "devdoc"; # demo app 22 25 23 26 src = fetchFromGitLab { 24 27 domain = "gitlab.gnome.org"; 25 28 owner = "GNOME"; 26 29 repo = "libadwaita"; 27 - rev = "8d66b987a19979d9d7b85dacc6bad5ce0c8743fe"; 28 - sha256 = "0i3wav6jsyi4w4i2r1rad769m5y5s9djj4zqb7dfyh0bad24ba3q"; 30 + rev = version; 31 + sha256 = "1v52md62kaqykv8b6kxxbxwnbdzlda4ir7n5wh2iizadcailyw7p"; 29 32 }; 30 33 31 34 nativeBuildInputs = [ 32 35 docbook-xsl-nons 36 + gi-docgen 33 37 gtk-doc 38 + libxml2 # for xmllint 34 39 meson 35 40 ninja 36 41 pkg-config ··· 43 48 ]; 44 49 45 50 buildInputs = [ 51 + fribidi 46 52 gobject-introspection 47 53 gtk4 48 54 ]; ··· 55 61 56 62 checkPhase = '' 57 63 xvfb-run meson test 64 + ''; 65 + 66 + postInstall = '' 67 + mv $out/share/{doc,gtk-doc} 58 68 ''; 59 69 60 70 meta = with lib; {