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

Merge pull request #68051 from dtzWill/update/libnl-3.5

Browse Source 
libnl: 3.4.0 -> 3.5.0, drop musl patch
This commit is contained in:
Will Dietz 2019-10-07 18:50:39 -05:00 committed by GitHub
commit 54ad1d8d41
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/os-specific/linux/libnl/default.nix
View File

@ -1,25 +1,19 @@
{ stdenv, file, lib, fetchFromGitHub, fetchpatch, autoreconfHook, bison, flex, pkgconfig { stdenv, file, lib, fetchFromGitHub, autoreconfHook, bison, flex, pkgconfig
, pythonSupport ? stdenv.buildPlatform == stdenv.hostPlatform, swig ? null, python}: , pythonSupport ? stdenv.buildPlatform == stdenv.hostPlatform, swig ? null, python}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libnl"; pname = "libnl";
version = "3.4.0"; version = "3.5.0";
src = fetchFromGitHub { src = fetchFromGitHub {
repo = "libnl"; repo = "libnl";
owner = "thom311"; owner = "thom311";
rev = "libnl${lib.replaceStrings ["."] ["_"] version}"; rev = "libnl${lib.replaceStrings ["."] ["_"] version}";
sha256 = "1bqf1f5glwf285sa98k5pkj9gg79lliixk1jk85j63v5510fbagp"; sha256 = "1ak30jcx52gl5yz1691qq0b76ldbcp2z6vsvdr2mrrwqiplqbcs2";
}; };
outputs = [ "bin" "dev" "out" "man" ] ++ lib.optional pythonSupport "py"; outputs = [ "bin" "dev" "out" "man" ] ++ lib.optional pythonSupport "py";
patches = stdenv.lib.optional stdenv.hostPlatform.isMusl
(fetchpatch {
url = "https://raw.githubusercontent.com/gentoo/musl/48d2a28710ae40877fd3e178ead1fb1bb0baa62c/dev-libs/libnl/files/libnl-3.3.0_rc1-musl.patch";
sha256 = "0dd7xxikib201i99k2if066hh7gwf2i4ffckrjplq6lr206jn00r";
});
enableParallelBuilding = true; enableParallelBuilding = true;
nativeBuildInputs = [ autoreconfHook bison flex pkgconfig file ] nativeBuildInputs = [ autoreconfHook bison flex pkgconfig file ]