diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-06-23 08:16:49 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2021-06-23 08:16:49 +0000 |
| commit | 4dc730a187d41f9f2dce4fe2680c32dcecb79b93 (patch) | |
| tree | 67673deb1649dc0a40962e70e6da302d7b6c4bf0 /nixpkgs/pkgs/development/libraries/libadwaita | |
| parent | 633cab0ecb07627706c6b523e219490f019eaab5 (diff) | |
| parent | 7e567a3d092b7de69cdf5deaeb8d9526de230916 (diff) | |
| download | nixlib-4dc730a187d41f9f2dce4fe2680c32dcecb79b93.tar nixlib-4dc730a187d41f9f2dce4fe2680c32dcecb79b93.tar.gz nixlib-4dc730a187d41f9f2dce4fe2680c32dcecb79b93.tar.bz2 nixlib-4dc730a187d41f9f2dce4fe2680c32dcecb79b93.tar.lz nixlib-4dc730a187d41f9f2dce4fe2680c32dcecb79b93.tar.xz nixlib-4dc730a187d41f9f2dce4fe2680c32dcecb79b93.tar.zst nixlib-4dc730a187d41f9f2dce4fe2680c32dcecb79b93.zip | |
Merge commit '7e567a3d092b7de69cdf5deaeb8d9526de230916'
# Conflicts: # nixpkgs/pkgs/top-level/all-packages.nix
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/libadwaita')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/libadwaita/default.nix | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/nixpkgs/pkgs/development/libraries/libadwaita/default.nix b/nixpkgs/pkgs/development/libraries/libadwaita/default.nix index f3b9cad0720b..d6cffcab7fed 100644 --- a/nixpkgs/pkgs/development/libraries/libadwaita/default.nix +++ b/nixpkgs/pkgs/development/libraries/libadwaita/default.nix @@ -2,35 +2,40 @@ , stdenv , fetchFromGitLab , docbook-xsl-nons +, gi-docgen , gtk-doc +, libxml2 , meson , ninja , pkg-config , sassc , vala , gobject-introspection +, fribidi , gtk4 , xvfb-run }: stdenv.mkDerivation rec { pname = "libadwaita"; - version = "unstable-2021-05-01"; + version = "1.0.0-alpha.1"; outputs = [ "out" "dev" "devdoc" ]; - outputBin = "dev"; + outputBin = "devdoc"; # demo app src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "GNOME"; repo = "libadwaita"; - rev = "8d66b987a19979d9d7b85dacc6bad5ce0c8743fe"; - sha256 = "0i3wav6jsyi4w4i2r1rad769m5y5s9djj4zqb7dfyh0bad24ba3q"; + rev = version; + sha256 = "1v52md62kaqykv8b6kxxbxwnbdzlda4ir7n5wh2iizadcailyw7p"; }; nativeBuildInputs = [ docbook-xsl-nons + gi-docgen gtk-doc + libxml2 # for xmllint meson ninja pkg-config @@ -43,6 +48,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ + fribidi gobject-introspection gtk4 ]; @@ -57,6 +63,10 @@ stdenv.mkDerivation rec { xvfb-run meson test ''; + postInstall = '' + mv $out/share/{doc,gtk-doc} + ''; + meta = with lib; { description = "Library to help with developing UI for mobile devices using GTK/GNOME"; homepage = "https://gitlab.gnome.org/GNOME/libadwaita"; |