diff options
| author | Vladimír Čunát <v@cunat.cz> | 2020-06-10 16:13:48 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2020-06-10 16:13:48 +0200 |
| commit | a5f5d020c69c22ddc6be48123ef4d30fd262c403 (patch) | |
| tree | bfb79b323b549e1f10a94d0153fdd3761ae893a6 /pkgs/tools/networking | |
| parent | ed43d951af1030d01e22fe0aaaed568af4e7e8e9 (diff) | |
| parent | bbe71613b6e656e707acdf9c279736c900bf4e87 (diff) | |
| download | nixpkgs-a5f5d020c69c22ddc6be48123ef4d30fd262c403.tar nixpkgs-a5f5d020c69c22ddc6be48123ef4d30fd262c403.tar.gz nixpkgs-a5f5d020c69c22ddc6be48123ef4d30fd262c403.tar.bz2 nixpkgs-a5f5d020c69c22ddc6be48123ef4d30fd262c403.tar.lz nixpkgs-a5f5d020c69c22ddc6be48123ef4d30fd262c403.tar.xz nixpkgs-a5f5d020c69c22ddc6be48123ef4d30fd262c403.tar.zst nixpkgs-a5f5d020c69c22ddc6be48123ef4d30fd262c403.zip | |
Merge branch 'staging-next'
Diffstat (limited to 'pkgs/tools/networking')
| -rw-r--r-- | pkgs/tools/networking/modem-manager/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/networking/openconnect_pa/default.nix | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/tools/networking/modem-manager/default.nix b/pkgs/tools/networking/modem-manager/default.nix index 7329d78c2c8..c3981b902f2 100644 --- a/pkgs/tools/networking/modem-manager/default.nix +++ b/pkgs/tools/networking/modem-manager/default.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { pname = "modem-manager"; - version = "1.12.8"; + version = "1.12.10"; package = "ModemManager"; src = fetchurl { url = "https://www.freedesktop.org/software/${package}/${package}-${version}.tar.xz"; - sha256 = "1zrsf57bn9rmaa2qvavr1aisci76vwlx0viqpwmkw3ds2l33vdb8"; + sha256 = "1apq9camys2gaw6y6ic1ld20cncfwpmxnzvh4j5zkbbjpf5hbcxj"; }; nativeBuildInputs = [ vala gobject-introspection gettext pkgconfig ]; diff --git a/pkgs/tools/networking/openconnect_pa/default.nix b/pkgs/tools/networking/openconnect_pa/default.nix index 2c452847aa3..4b108dc303e 100644 --- a/pkgs/tools/networking/openconnect_pa/default.nix +++ b/pkgs/tools/networking/openconnect_pa/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { }; preConfigure = '' - export PKG_CONFIG=${pkgconfig}/bin/pkg-config + export PKG_CONFIG=${pkgconfig}/bin/${pkgconfig.targetPrefix}pkg-config export LIBXML2_CFLAGS="-I ${libxml2.dev}/include/libxml2" export LIBXML2_LIBS="-L${libxml2.out}/lib -lxml2" ''; |