diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-08-23 09:55:51 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-08-23 10:02:07 +0200 |
| commit | 7c8518c194af83d9245b259984fea45e39f05e41 (patch) | |
| tree | c1da6b18e88e87936c05f01fb41e5bfa241d4675 /pkgs/os-specific/linux | |
| parent | c64a1332ec5f8eef9c443701900d367e4587919e (diff) | |
| download | nixpkgs-7c8518c194af83d9245b259984fea45e39f05e41.tar nixpkgs-7c8518c194af83d9245b259984fea45e39f05e41.tar.gz nixpkgs-7c8518c194af83d9245b259984fea45e39f05e41.tar.bz2 nixpkgs-7c8518c194af83d9245b259984fea45e39f05e41.tar.lz nixpkgs-7c8518c194af83d9245b259984fea45e39f05e41.tar.xz nixpkgs-7c8518c194af83d9245b259984fea45e39f05e41.tar.zst nixpkgs-7c8518c194af83d9245b259984fea45e39f05e41.zip | |
Cleanup
Diffstat (limited to 'pkgs/os-specific/linux')
| -rw-r--r-- | pkgs/os-specific/linux/libcap/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/systemd/default.nix | 4 |
2 files changed, 4 insertions, 6 deletions
diff --git a/pkgs/os-specific/linux/libcap/default.nix b/pkgs/os-specific/linux/libcap/default.nix index 92f15c1ade3..e82214df634 100644 --- a/pkgs/os-specific/linux/libcap/default.nix +++ b/pkgs/os-specific/linux/libcap/default.nix @@ -5,12 +5,14 @@ assert stdenv.isLinux; stdenv.mkDerivation rec { name = "libcap-${version}"; version = "2.22"; - + src = fetchurl { url = "mirror://gentoo/distfiles/${name}.tar.bz2"; sha256 = "03q50j6bg65cc501q87qh328ncav1i8qw2bjig99vxmmfx4bvsvk"; }; - + + outputs = [ "dev" "out" ]; + nativeBuildInputs = [ perl ]; propagatedBuildInputs = [ attr ]; diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 05257aa3e0a..4f0157e48ca 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -128,10 +128,6 @@ stdenv.mkDerivation rec { for i in $libudev/lib/*.la $libudev/lib/pkgconfig/*.pc; do substituteInPlace $i --replace $out $libudev done - - # FIXME: move into stdenv - prefix="$libudev" patchELF - prefix="$libudev" stripDirs "lib" "''${stripDebugFlags:--S}" ''; # */ enableParallelBuilding = true; |