diff options
| author | Bobby Rong <rjl931189261@126.com> | 2022-04-23 10:00:09 +0800 |
|---|---|---|
| committer | Bobby Rong <rjl931189261@126.com> | 2022-04-23 10:11:30 +0800 |
| commit | 797898a45561e69a5830d1f29391f08da53bb6dd (patch) | |
| tree | bac91c076c662463a2c9cddaa3ec70afba1d5742 /pkgs/tools/package-management/packagekit | |
| parent | 90147b38081852ae46c79461edcebb1bbd372702 (diff) | |
| download | nixpkgs-797898a45561e69a5830d1f29391f08da53bb6dd.tar nixpkgs-797898a45561e69a5830d1f29391f08da53bb6dd.tar.gz nixpkgs-797898a45561e69a5830d1f29391f08da53bb6dd.tar.bz2 nixpkgs-797898a45561e69a5830d1f29391f08da53bb6dd.tar.lz nixpkgs-797898a45561e69a5830d1f29391f08da53bb6dd.tar.xz nixpkgs-797898a45561e69a5830d1f29391f08da53bb6dd.tar.zst nixpkgs-797898a45561e69a5830d1f29391f08da53bb6dd.zip | |
packagekit: fix build with Nix 2.8
https://github.com/PackageKit/PackageKit/compare/33b847c...30bb82d
Diffstat (limited to 'pkgs/tools/package-management/packagekit')
| -rw-r--r-- | pkgs/tools/package-management/packagekit/default.nix | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/pkgs/tools/package-management/packagekit/default.nix b/pkgs/tools/package-management/packagekit/default.nix index 15f94aceaa4..66064139f38 100644 --- a/pkgs/tools/package-management/packagekit/default.nix +++ b/pkgs/tools/package-management/packagekit/default.nix @@ -11,7 +11,6 @@ , vala , gtk-doc , nix -, nlohmann_json ? null , boost , meson , ninja @@ -27,12 +26,6 @@ , enableSystemd ? stdenv.isLinux , systemd }: -let - nix_version = lib.removeSuffix nix.VERSION_SUFFIX nix.version; - useNlohmann = lib.versionAtLeast "2.7" nix_version; -in - -assert useNlohmann -> nlohmann_json != null; stdenv.mkDerivation rec { pname = "packagekit"; @@ -43,8 +36,8 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "PackageKit"; repo = "PackageKit"; - rev = "33b847c49b4a42499e3c0f10fef62830c874e086"; - sha256 = "UDpMswf0EBwcoHTqoWiztXnIAwM69nM+S9MPsR24amw="; + rev = "30bb82da8d4161330a6d7a20c9989149303421a1"; + sha256 = "k2osc2v0OuGrNjwxdqn785RsbHEJP3p79PG9YqnVE3U="; }; buildInputs = [ @@ -59,7 +52,6 @@ stdenv.mkDerivation rec { nix boost ] ++ lib.optional enableSystemd systemd - ++ lib.optional useNlohmann nlohmann_json ++ lib.optional enableBashCompletion bash-completion; nativeBuildInputs = [ vala |