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