mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-22 13:29:00 +02:00
Merge pull request #15347 from joachifm/kernel-headers-cleanup
linuxHeaders cleanup
This commit is contained in:
commit
77022120f7
|
@ -1,7 +1,8 @@
|
||||||
{ stdenv, fetchFromGitHub, pkgconfig, intltool, gperf, libcap, kmod
|
{ stdenv, fetchFromGitHub, pkgconfig, intltool, gperf, libcap, kmod
|
||||||
, zlib, xz, pam, acl, cryptsetup, libuuid, m4, utillinux, libffi
|
, zlib, xz, pam, acl, cryptsetup, libuuid, m4, utillinux, libffi
|
||||||
, glib, kbd, libxslt, coreutils, libgcrypt, libgpgerror, libapparmor, audit, lz4
|
, glib, kbd, libxslt, coreutils, libgcrypt, libgpgerror, libapparmor, audit, lz4
|
||||||
, kexectools, libmicrohttpd, linuxHeaders, libseccomp, iptables
|
, kexectools, libmicrohttpd, linuxHeaders ? stdenv.cc.libc.linuxHeaders, libseccomp
|
||||||
|
, iptables
|
||||||
, autoreconfHook, gettext, docbook_xsl, docbook_xml_dtd_42, docbook_xml_dtd_45
|
, autoreconfHook, gettext, docbook_xsl, docbook_xml_dtd_42, docbook_xml_dtd_45
|
||||||
, enableKDbus ? false
|
, enableKDbus ? false
|
||||||
}:
|
}:
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
{ lib, stdenv, fetchFromGitHub, libgcrypt
|
{ stdenv, fetchFromGitHub, libgcrypt
|
||||||
, pkgconfig, glib, linuxHeaders, sqlite }:
|
, pkgconfig, glib, linuxHeaders ? stdenv.cc.libc.linuxHeaders, sqlite }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "duperemove-${version}";
|
name = "duperemove-${version}";
|
||||||
|
@ -16,11 +16,11 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
makeFlags = [ "DESTDIR=$(out)" "PREFIX=" ];
|
makeFlags = [ "DESTDIR=$(out)" "PREFIX=" ];
|
||||||
|
|
||||||
meta = {
|
meta = with stdenv.lib; {
|
||||||
description = "A simple tool for finding duplicated extents and submitting them for deduplication";
|
description = "A simple tool for finding duplicated extents and submitting them for deduplication";
|
||||||
homepage = https://github.com/markfasheh/duperemove;
|
homepage = https://github.com/markfasheh/duperemove;
|
||||||
license = lib.licenses.gpl2;
|
license = licenses.gpl2;
|
||||||
maintainers = with lib.maintainers; [ bluescreen303 thoughtpolice ];
|
maintainers = with maintainers; [ bluescreen303 thoughtpolice ];
|
||||||
platforms = lib.platforms.all;
|
platforms = platforms.linux;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -759,9 +759,7 @@ in
|
||||||
|
|
||||||
dtrx = callPackage ../tools/compression/dtrx { };
|
dtrx = callPackage ../tools/compression/dtrx { };
|
||||||
|
|
||||||
duperemove = callPackage ../tools/filesystems/duperemove {
|
duperemove = callPackage ../tools/filesystems/duperemove { };
|
||||||
linuxHeaders = linuxHeaders_3_18;
|
|
||||||
};
|
|
||||||
|
|
||||||
dynamic-colors = callPackage ../tools/misc/dynamic-colors { };
|
dynamic-colors = callPackage ../tools/misc/dynamic-colors { };
|
||||||
|
|
||||||
|
@ -11204,7 +11202,6 @@ in
|
||||||
sysstat = callPackage ../os-specific/linux/sysstat { };
|
sysstat = callPackage ../os-specific/linux/sysstat { };
|
||||||
|
|
||||||
systemd = callPackage ../os-specific/linux/systemd {
|
systemd = callPackage ../os-specific/linux/systemd {
|
||||||
linuxHeaders = linuxHeaders_3_18;
|
|
||||||
utillinux = utillinuxMinimal; # break the cyclic dependency
|
utillinux = utillinuxMinimal; # break the cyclic dependency
|
||||||
}
|
}
|
||||||
// {
|
// {
|
||||||
|
|
Loading…
Reference in a new issue