diff options
author | c0bw3b <c0bw3b@users.noreply.github.com> | 2019-11-23 17:30:46 +0100 |
---|---|---|
committer | c0bw3b <c0bw3b@users.noreply.github.com> | 2019-11-23 18:15:13 +0100 |
commit | b1a24b2118a123f9155dba01c5c1c45667d18cc3 (patch) | |
tree | 9f436412eeae813f83916f87ffac807896539286 /pkgs | |
parent | 576a82d6c24a84d70da5ea7d70904206f5129e23 (diff) | |
download | nixpkgs-b1a24b2118a123f9155dba01c5c1c45667d18cc3.tar nixpkgs-b1a24b2118a123f9155dba01c5c1c45667d18cc3.tar.gz nixpkgs-b1a24b2118a123f9155dba01c5c1c45667d18cc3.tar.bz2 nixpkgs-b1a24b2118a123f9155dba01c5c1c45667d18cc3.tar.lz nixpkgs-b1a24b2118a123f9155dba01c5c1c45667d18cc3.tar.xz nixpkgs-b1a24b2118a123f9155dba01c5c1c45667d18cc3.tar.zst nixpkgs-b1a24b2118a123f9155dba01c5c1c45667d18cc3.zip |
bctoolbox: set meta.homepage
+ move cmake and bcunit to nativeBuildInputs + use current mbedtls
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/libraries/bctoolbox/default.nix | 16 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 11 insertions, 9 deletions
diff --git a/pkgs/development/libraries/bctoolbox/default.nix b/pkgs/development/libraries/bctoolbox/default.nix index 2730696344e..a9d21a1f5a9 100644 --- a/pkgs/development/libraries/bctoolbox/default.nix +++ b/pkgs/development/libraries/bctoolbox/default.nix @@ -1,19 +1,23 @@ -{stdenv, fetchFromGitHub, cmake, mbedtls, bcunit, srtp}: +{ stdenv, fetchFromGitHub, cmake, bcunit, mbedtls }: + stdenv.mkDerivation rec { - name = "${baseName}-${version}"; - baseName = "bctoolbox"; + pname = "bctoolbox"; version = "0.6.0"; - buildInputs = [cmake mbedtls bcunit srtp]; + + nativeBuildInputs = [ cmake bcunit ]; + buildInputs = [ mbedtls ]; + src = fetchFromGitHub { owner = "BelledonneCommunications"; - repo = baseName; + repo = pname; rev = version; sha256 = "1cxx243wyzkd4xnvpyqf97n0rjhfckpvw1vhwnbwshq3q6fra909"; }; meta = { inherit version; - description = ''Utilities library for Linphone''; + description = "Utilities library for Linphone"; + homepage = "https://github.com/BelledonneCommunications/bctoolbox"; license = stdenv.lib.licenses.gpl2Plus ; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 30d0abb508a..3268f707ef5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10697,9 +10697,7 @@ in bamf = callPackage ../development/libraries/bamf { }; - bctoolbox = callPackage ../development/libraries/bctoolbox { - mbedtls = mbedtls_1_3; - }; + bctoolbox = callPackage ../development/libraries/bctoolbox { }; beecrypt = callPackage ../development/libraries/beecrypt { }; |