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

Merge pull request #105242 from RaghavSood/microhttpd/version

Browse Source 
libmicrohttpd dependents: fix build
This commit is contained in:
Raghav Sood 2020-12-04 05:37:48 +00:00 committed by GitHub
commit 3a3e8e6a8b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 31 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/audio/faust/faustlive.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub { stdenv, fetchFromGitHub
, llvm, qt48Full, qrencode, libmicrohttpd, libjack2, alsaLib, faust, curl , llvm, qt48Full, qrencode, libmicrohttpd_0_9_70, libjack2, alsaLib, faust, curl
, bc, coreutils, which, libsndfile, pkg-config , bc, coreutils, which, libsndfile, pkg-config
}: }:
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
}; };
buildInputs = [ buildInputs = [
llvm qt48Full qrencode libmicrohttpd libjack2 alsaLib faust curl llvm qt48Full qrencode libmicrohttpd_0_9_70 libjack2 alsaLib faust curl
bc coreutils which libsndfile pkg-config bc coreutils which libsndfile pkg-config
]; ];

4
pkgs/applications/misc/xmr-stak/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, stdenvGcc6, lib { stdenv, stdenvGcc6, lib
, fetchFromGitHub, cmake, libmicrohttpd, openssl , fetchFromGitHub, cmake, libmicrohttpd_0_9_70, openssl
, opencl-headers, ocl-icd, hwloc, cudatoolkit , opencl-headers, ocl-icd, hwloc, cudatoolkit
, devDonationLevel ? "0.0" , devDonationLevel ? "0.0"
, cudaSupport ? false , cudaSupport ? false
@ -27,7 +27,7 @@ stdenv'.mkDerivation rec {
++ lib.optional (!openclSupport) "-DOpenCL_ENABLE=OFF"; ++ lib.optional (!openclSupport) "-DOpenCL_ENABLE=OFF";
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
buildInputs = [ libmicrohttpd openssl hwloc ] buildInputs = [ libmicrohttpd_0_9_70 openssl hwloc ]
++ lib.optional cudaSupport cudatoolkit ++ lib.optional cudaSupport cudatoolkit
++ lib.optionals openclSupport [ opencl-headers ocl-icd ]; ++ lib.optionals openclSupport [ opencl-headers ocl-icd ];

10
pkgs/development/libraries/libmicrohttpd/0.9.70.nix Normal file
View File

@ -0,0 +1,10 @@
{ stdenv, callPackage, fetchurl }:
callPackage ./generic.nix ( rec {
version = "0.9.70";
src = fetchurl {
url = "mirror://gnu/libmicrohttpd/libmicrohttpd-${version}.tar.gz";
sha256 = "01vkjy89b1ylmh22dy5yza2r414nfwcfixxh3v29nvzrjv9s7l4h";
};
})

10
pkgs/development/libraries/libmicrohttpd/0.9.71.nix Normal file
View File

@ -0,0 +1,10 @@
{ stdenv, callPackage, fetchurl }:
callPackage ./generic.nix ( rec {
version = "0.9.71";
src = fetchurl {
url = "mirror://gnu/libmicrohttpd/libmicrohttpd-${version}.tar.gz";
sha256 = "10mii4mifmfs3v7kgciqml7f0fj7ljp0sngrx64pnwmgbzl4bx78";
};
})

9
pkgs/development/libraries/libmicrohttpd/default.nix → pkgs/development/libraries/libmicrohttpd/generic.nix
View File

@ -1,13 +1,8 @@
{ stdenv, fetchurl, libgcrypt, curl, gnutls, pkgconfig, libiconv, libintl }: { stdenv, libgcrypt, curl, gnutls, pkgconfig, libiconv, libintl, version, src }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libmicrohttpd"; pname = "libmicrohttpd";
version = "0.9.71"; inherit version src;
src = fetchurl {
url = "mirror://gnu/libmicrohttpd/${pname}-${version}.tar.gz";
sha256 = "10mii4mifmfs3v7kgciqml7f0fj7ljp0sngrx64pnwmgbzl4bx78";
};
outputs = [ "out" "dev" "devdoc" "info" ]; outputs = [ "out" "dev" "devdoc" "info" ];
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];

4
pkgs/servers/fileshare/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, lib, fetchgit, pkgconfig, git, libmicrohttpd }: { stdenv, lib, fetchgit, pkgconfig, git, libmicrohttpd_0_9_70 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "fileshare"; pname = "fileshare";
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
''; '';
nativeBuildInputs = [ pkgconfig git ]; nativeBuildInputs = [ pkgconfig git ];
buildInputs = [ libmicrohttpd ]; buildInputs = [ libmicrohttpd_0_9_70 ];
makeFlags = [ "BUILD=release" ]; makeFlags = [ "BUILD=release" ];

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

@ -14362,7 +14362,9 @@ in
libmemcached = callPackage ../development/libraries/libmemcached { }; libmemcached = callPackage ../development/libraries/libmemcached { };
libmicrohttpd = callPackage ../development/libraries/libmicrohttpd { }; libmicrohttpd_0_9_70 = callPackage ../development/libraries/libmicrohttpd/0.9.70.nix { };
libmicrohttpd_0_9_71 = callPackage ../development/libraries/libmicrohttpd/0.9.71.nix { };
libmicrohttpd = libmicrohttpd_0_9_71;
libmikmod = callPackage ../development/libraries/libmikmod { libmikmod = callPackage ../development/libraries/libmikmod {
inherit (darwin.apple_sdk.frameworks) CoreAudio; inherit (darwin.apple_sdk.frameworks) CoreAudio;