plistcpp: migrate to by-name, refactor
This commit is contained in:
parent
a0979ec041
commit
8590df67b9
4 changed files with 23 additions and 10 deletions
|
@ -1,22 +1,36 @@
|
|||
{ lib, stdenv, fetchFromGitHub, cmake, boost, NSPlist, pugixml }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, boost
|
||||
, NSPlist
|
||||
, pugixml
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "PlistCpp";
|
||||
version = "unstable-11615d";
|
||||
pname = "plistcpp";
|
||||
version = "0-unstable-2017-04-11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "matthewbauer";
|
||||
repo = "PlistCpp";
|
||||
rev = "11615deab3369356a182dabbf5bae30574967264";
|
||||
sha256 = "10jn6bvm9vn6492zix2pd724v5h4lccmkqg3lxfw8r0qg3av0yzv";
|
||||
hash = "sha256-+3uw1XgYZMRdp+PhWRmjBJZNxGlX9PhFIsbuVPcyVoI=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
sed -i "1i #include <algorithm>" src/Plist.cpp
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [ boost NSPlist pugixml ];
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
boost
|
||||
NSPlist
|
||||
pugixml
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
maintainers = with maintainers; [ matthewbauer ];
|
|
@ -2,7 +2,7 @@
|
|||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, boost
|
||||
, PlistCpp
|
||||
, plistcpp
|
||||
, pugixml
|
||||
}:
|
||||
|
||||
|
@ -19,7 +19,7 @@ stdenv.mkDerivation {
|
|||
|
||||
buildInputs = [
|
||||
boost
|
||||
PlistCpp
|
||||
plistcpp
|
||||
pugixml
|
||||
];
|
||||
|
||||
|
|
|
@ -792,6 +792,7 @@ mapAliases ({
|
|||
pinentry_gtk2 = throw "'pinentry_gtk2' has been renamed to/replaced by 'pinentry-gtk2'"; # Converted to throw 2023-09-10
|
||||
pinentry_qt = throw "'pinentry_qt' has been renamed to/replaced by 'pinentry-qt'"; # Converted to throw 2023-09-10
|
||||
pinentry_qt5 = pinentry-qt; # Added 2020-02-11
|
||||
PlistCpp = plistcpp; # Added 2024-01-05
|
||||
poetry2nix = throw "poetry2nix is now maintained out-of-tree. Please use https://github.com/nix-community/poetry2nix/"; # Added 2023-10-26
|
||||
prayer = throw "prayer has been removed from nixpkgs"; # Added 2023-11-09
|
||||
privacyidea = throw "privacyidea has been removed from nixpkgs"; # Added 2023-10-31
|
||||
|
|
|
@ -41669,8 +41669,6 @@ with pkgs;
|
|||
|
||||
NSPlist = callPackage ../development/libraries/NSPlist { };
|
||||
|
||||
PlistCpp = callPackage ../development/libraries/PlistCpp { };
|
||||
|
||||
linode-cli = python3Packages.callPackage ../tools/virtualization/linode-cli { };
|
||||
|
||||
hss = callPackage ../tools/networking/hss { };
|
||||
|
|
Loading…
Reference in a new issue