b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #169888 from bobby285271/packagekit

Browse source 
packagekit: fix build with Nix 2.8
This commit is contained in:
Bobby Rong 2022-04-28 20:46:21 +08:00 committed by GitHub
parent 4ae168415d 797898a455
commit c2548605dc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
pkgs/tools/package-management/packagekit/default.nix
View file

@ -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

2
pkgs/top-level/all-packages.nix
View file

@ -9056,7 +9056,7 @@ with pkgs;
p7zip = callPackage ../tools/archivers/p7zip { };
packagekit = callPackage ../tools/package-management/packagekit { nix = nixVersions.nix_2_6; };
packagekit = callPackage ../tools/package-management/packagekit { nix = nixVersions.nix_2_8; };
packetdrill = callPackage ../tools/networking/packetdrill { };