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

Merge pull request #15347 from joachifm/kernel-headers-cleanup

Browse Source 
linuxHeaders cleanup
This commit is contained in:
Joachim Fasting 2016-05-14 08:53:48 +02:00
commit 77022120f7
3 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/os-specific/linux/systemd/default.nix
View File

@ -1,7 +1,8 @@
{ stdenv, fetchFromGitHub, pkgconfig, intltool, gperf, libcap, kmod
, zlib, xz, pam, acl, cryptsetup, libuuid, m4, utillinux, libffi
, 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
, enableKDbus ? false
}:

12
pkgs/tools/filesystems/duperemove/default.nix
View File

@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, libgcrypt
, pkgconfig, glib, linuxHeaders, sqlite }:
{ stdenv, fetchFromGitHub, libgcrypt
, pkgconfig, glib, linuxHeaders ? stdenv.cc.libc.linuxHeaders, sqlite }:
stdenv.mkDerivation rec {
name = "duperemove-${version}";
@ -16,11 +16,11 @@ stdenv.mkDerivation rec {
makeFlags = [ "DESTDIR=$(out)" "PREFIX=" ];
meta = {
meta = with stdenv.lib; {
description = "A simple tool for finding duplicated extents and submitting them for deduplication";
homepage = https://github.com/markfasheh/duperemove;
license = lib.licenses.gpl2;
maintainers = with lib.maintainers; [ bluescreen303 thoughtpolice ];
platforms = lib.platforms.all;
license = licenses.gpl2;
maintainers = with maintainers; [ bluescreen303 thoughtpolice ];
platforms = platforms.linux;
};
}

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

@ -759,9 +759,7 @@ in
dtrx = callPackage ../tools/compression/dtrx { };
duperemove = callPackage ../tools/filesystems/duperemove {
linuxHeaders = linuxHeaders_3_18;
};
duperemove = callPackage ../tools/filesystems/duperemove { };
dynamic-colors = callPackage ../tools/misc/dynamic-colors { };
@ -11204,7 +11202,6 @@ in
sysstat = callPackage ../os-specific/linux/sysstat { };
systemd = callPackage ../os-specific/linux/systemd {
linuxHeaders = linuxHeaders_3_18;
utillinux = utillinuxMinimal; # break the cyclic dependency
}
// {