diff options
| author | Joachim Fasting <joachifm@users.noreply.github.com> | 2016-05-14 08:53:48 +0200 |
|---|---|---|
| committer | Joachim Fasting <joachifm@users.noreply.github.com> | 2016-05-14 08:53:48 +0200 |
| commit | 77022120f710b6640606282450420cadbbb2d2ca (patch) | |
| tree | 21e5d90daae5a100e40f984941542db5a12bc705 | |
| parent | 3f0518ac4da155faaeb9b9fc3e81d11778f73448 (diff) | |
| parent | e0c07070b1fca1ec237f3a4ab04cbec0b6c75282 (diff) | |
| download | nixlib-77022120f710b6640606282450420cadbbb2d2ca.tar nixlib-77022120f710b6640606282450420cadbbb2d2ca.tar.gz nixlib-77022120f710b6640606282450420cadbbb2d2ca.tar.bz2 nixlib-77022120f710b6640606282450420cadbbb2d2ca.tar.lz nixlib-77022120f710b6640606282450420cadbbb2d2ca.tar.xz nixlib-77022120f710b6640606282450420cadbbb2d2ca.tar.zst nixlib-77022120f710b6640606282450420cadbbb2d2ca.zip | |
Merge pull request #15347 from joachifm/kernel-headers-cleanup
linuxHeaders cleanup
| -rw-r--r-- | pkgs/os-specific/linux/systemd/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/tools/filesystems/duperemove/default.nix | 12 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 5 |
3 files changed, 9 insertions, 11 deletions
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index d6a928cd0cfd..3af702982fb6 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -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 }: diff --git a/pkgs/tools/filesystems/duperemove/default.nix b/pkgs/tools/filesystems/duperemove/default.nix index 146414a47e10..d333334d394c 100644 --- a/pkgs/tools/filesystems/duperemove/default.nix +++ b/pkgs/tools/filesystems/duperemove/default.nix @@ -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; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 690dab41d413..113fbb749e2b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 } // { |