Merge #173297: Revert "libpcap: move dev things to extra output"
...into staging-next
This commit is contained in:
commit
2e723c576f
1 changed files with 0 additions and 4 deletions
|
@ -6,8 +6,6 @@ stdenv.mkDerivation rec {
|
||||||
pname = "libpcap";
|
pname = "libpcap";
|
||||||
version = "1.10.1";
|
version = "1.10.1";
|
||||||
|
|
||||||
outputs = [ "out" "dev" ];
|
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://www.tcpdump.org/release/${pname}-${version}.tar.gz";
|
url = "https://www.tcpdump.org/release/${pname}-${version}.tar.gz";
|
||||||
sha256 = "sha256-7ShfSsyvBTRPkJdXV7Pb/ncrpB0cQBwmSLf6RbcRvdQ=";
|
sha256 = "sha256-7ShfSsyvBTRPkJdXV7Pb/ncrpB0cQBwmSLf6RbcRvdQ=";
|
||||||
|
@ -29,8 +27,6 @@ stdenv.mkDerivation rec {
|
||||||
if [ "$dontDisableStatic" -ne "1" ]; then
|
if [ "$dontDisableStatic" -ne "1" ]; then
|
||||||
rm -f $out/lib/libpcap.a
|
rm -f $out/lib/libpcap.a
|
||||||
fi
|
fi
|
||||||
|
|
||||||
moveToOutput "bin/pcap-config" "$dev"
|
|
||||||
'';
|
'';
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
|
|
Loading…
Reference in a new issue