JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

interception-tools: removed custom libyamlcppWithoutBoost

Browse Source 
Since upstream libyaml-cpp does not reuqire boost anymore it is safe to
remove.
This commit is contained in:
Andreas Rammhold 2018-01-30 17:11:52 +01:00
parent f80b233072
commit 85d0eb712f
No known key found for this signature in database
GPG Key ID: E432E410B5E48C86
2 changed files with 3 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/tools/inputmethods/interception-tools/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, fetchFromGitHub, pkgconfig, cmake, libyamlcppWithoutBoost,
{ stdenv, fetchurl, fetchFromGitHub, pkgconfig, cmake, libyamlcpp,
libevdev, libudev }:
let
@ -12,8 +12,8 @@ in stdenv.mkDerivation {
sha256 = "14g4pphvylqdb922va322z1pbp12ap753hcf7zf9sii1ikvif83j";
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ cmake libevdev libudev libyamlcppWithoutBoost ];
nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [ libevdev libudev libyamlcpp ];
prePatch = ''
substituteInPlace CMakeLists.txt --replace \

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

@ -10172,23 +10172,6 @@ with pkgs;
};
});
# interception-tools needs this. This should be removed when there is a new
# release of libyamlcpp, i.e. when the version of libyamlcpp is newer than
# 0.5.3.
libyamlcppWithoutBoost = libyamlcpp.overrideAttrs (oldAttrs: rec {
name = "libyaml-cpp-${version}";
version = "2017-08-25";
src = fetchFromGitHub {
owner = "jbeder";
repo = "yaml-cpp";
rev = "beb44b872c07c74556314e730c6f20a00b32e8e5";
sha256 = "1qkr3i5lin6m36w5rbimc7pjx3nx686xnjb6lw00xf67iqrl4h4m";
};
buildInputs = [ cmake ];
});
libykneomgr = callPackage ../development/libraries/libykneomgr { };
libytnef = callPackage ../development/libraries/libytnef { };