diff options
author | Alyssa Ross <hi@alyssa.is> | 2024-01-07 14:58:29 +0100 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2024-01-07 14:58:29 +0100 |
commit | ad899504860973e98351c922ecb934595f2c0f19 (patch) | |
tree | b1260cc90947e834af941c6cb6aed51dc68f50b5 /nixpkgs/pkgs/development/libraries/appstream/default.nix | |
parent | f34a1b70eb86e4a63cfb88ea460345bb1aed88e3 (diff) | |
parent | dc676e1b5014069a2b06e236242e2f0990384934 (diff) | |
download | nixlib-ad899504860973e98351c922ecb934595f2c0f19.tar nixlib-ad899504860973e98351c922ecb934595f2c0f19.tar.gz nixlib-ad899504860973e98351c922ecb934595f2c0f19.tar.bz2 nixlib-ad899504860973e98351c922ecb934595f2c0f19.tar.lz nixlib-ad899504860973e98351c922ecb934595f2c0f19.tar.xz nixlib-ad899504860973e98351c922ecb934595f2c0f19.tar.zst nixlib-ad899504860973e98351c922ecb934595f2c0f19.zip |
Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/appstream/default.nix')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/appstream/default.nix | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/nixpkgs/pkgs/development/libraries/appstream/default.nix b/nixpkgs/pkgs/development/libraries/appstream/default.nix index 78ca9cfddbad..c5fb2036d324 100644 --- a/nixpkgs/pkgs/development/libraries/appstream/default.nix +++ b/nixpkgs/pkgs/development/libraries/appstream/default.nix @@ -23,12 +23,14 @@ , gperf , vala , curl +, systemd , nixosTests +, withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd }: stdenv.mkDerivation rec { pname = "appstream"; - version = "0.15.5"; + version = "1.0.1"; outputs = [ "out" "dev" "installedTests" ]; @@ -36,7 +38,7 @@ stdenv.mkDerivation rec { owner = "ximion"; repo = "appstream"; rev = "v${version}"; - sha256 = "sha256-KVZCtu1w5FMgXZMiSW55rbrI6W/A9zWWKKvACtk/jjk="; + sha256 = "sha256-ULqRHepWVuAluXsXJUoqxqJfrN168MGlwdVkoLLwSN0="; }; patches = [ @@ -82,6 +84,8 @@ stdenv.mkDerivation rec { libxmlb libyaml curl + ] ++ lib.optionals withSystemd [ + systemd ]; mesonFlags = [ @@ -89,6 +93,8 @@ stdenv.mkDerivation rec { "-Ddocs=false" "-Dvapi=true" "-Dinstalled_test_prefix=${placeholder "installedTests"}" + ] ++ lib.optionals (!withSystemd) [ + "-Dsystemd=false" ]; passthru = { |