From 46420bbaa3f8f79ce7b9ee68e98eba1f7bce2db6 Mon Sep 17 00:00:00 2001 From: volth Date: Thu, 15 Aug 2019 12:41:18 +0000 Subject: treewide: name -> pname (easy cases) (#66585) treewide replacement of stdenv.mkDerivation rec { name = "*-${version}"; version = "*"; to pname --- pkgs/os-specific/linux/libcap/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'pkgs/os-specific/linux/libcap') diff --git a/pkgs/os-specific/linux/libcap/default.nix b/pkgs/os-specific/linux/libcap/default.nix index 87f354aa75d..9c730bb9659 100644 --- a/pkgs/os-specific/linux/libcap/default.nix +++ b/pkgs/os-specific/linux/libcap/default.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, attr, perl, pam }: stdenv.mkDerivation rec { - name = "libcap-${version}"; + pname = "libcap"; version = "2.27"; src = fetchurl { - url = "mirror://kernel/linux/libs/security/linux-privs/libcap2/${name}.tar.xz"; + url = "mirror://kernel/linux/libs/security/linux-privs/libcap2/${pname}-${version}.tar.xz"; sha256 = "0sj8kidl7qgf2qwxcbw1vadnlb30y4zvjzxswsmfdghq04npkhfs"; }; @@ -45,8 +45,8 @@ stdenv.mkDerivation rec { postInstall = '' rm "$lib"/lib/*.a - mkdir -p "$doc/share/doc/${name}" - cp License "$doc/share/doc/${name}/" + mkdir -p "$doc/share/doc/${pname}-${version}" + cp License "$doc/share/doc/${pname}-${version}/" '' + stdenv.lib.optionalString (pam != null) '' mkdir -p "$pam/lib/security" mv "$lib"/lib/security "$pam/lib" -- cgit 1.4.1