nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-25 00:12:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

packagekit: fix build with Nix 2.8

Browse Source 
33b847c...30bb82d
This commit is contained in:
Bobby Rong 2022-04-23 10:00:09 +08:00
parent 90147b3808
commit 797898a455
No known key found for this signature in database
GPG Key ID: ED07364437C91161
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 , vala
, gtk-doc , gtk-doc
, nix , nix
, nlohmann_json ? null
, boost , boost
, meson , meson
, ninja , ninja
@ -27,12 +26,6 @@
, enableSystemd ? stdenv.isLinux , enableSystemd ? stdenv.isLinux
, systemd , 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 { stdenv.mkDerivation rec {
pname = "packagekit"; pname = "packagekit";
@ -43,8 +36,8 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "PackageKit"; owner = "PackageKit";
repo = "PackageKit"; repo = "PackageKit";
rev = "33b847c49b4a42499e3c0f10fef62830c874e086"; rev = "30bb82da8d4161330a6d7a20c9989149303421a1";
sha256 = "UDpMswf0EBwcoHTqoWiztXnIAwM69nM+S9MPsR24amw="; sha256 = "k2osc2v0OuGrNjwxdqn785RsbHEJP3p79PG9YqnVE3U=";
}; };
buildInputs = [ buildInputs = [
@ -59,7 +52,6 @@ stdenv.mkDerivation rec {
nix nix
boost boost
] ++ lib.optional enableSystemd systemd ] ++ lib.optional enableSystemd systemd
++ lib.optional useNlohmann nlohmann_json
++ lib.optional enableBashCompletion bash-completion; ++ lib.optional enableBashCompletion bash-completion;
nativeBuildInputs = [ nativeBuildInputs = [
vala vala

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

@ -9028,7 +9028,7 @@ with pkgs;
p7zip = callPackage ../tools/archivers/p7zip { }; 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 { }; packetdrill = callPackage ../tools/networking/packetdrill { };