diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2018-05-03 00:58:11 -0500 |
|---|---|---|
| committer | Matthew Bauer <mjbauer95@gmail.com> | 2018-05-03 13:09:20 -0500 |
| commit | 143978a477e4891bd94be6d9fcf257f726b403cd (patch) | |
| tree | b93f545ca15d5dd7410e7ec13be3df1709b935c6 /pkgs/os-specific/linux/libcap | |
| parent | 3216cf6cdf5a9d0e77af10add1a9cd5c0d6106c2 (diff) | |
| download | nixpkgs-143978a477e4891bd94be6d9fcf257f726b403cd.tar nixpkgs-143978a477e4891bd94be6d9fcf257f726b403cd.tar.gz nixpkgs-143978a477e4891bd94be6d9fcf257f726b403cd.tar.bz2 nixpkgs-143978a477e4891bd94be6d9fcf257f726b403cd.tar.lz nixpkgs-143978a477e4891bd94be6d9fcf257f726b403cd.tar.xz nixpkgs-143978a477e4891bd94be6d9fcf257f726b403cd.tar.zst nixpkgs-143978a477e4891bd94be6d9fcf257f726b403cd.zip | |
treewide: remove platform assertions
linux: readd assertion
Diffstat (limited to 'pkgs/os-specific/linux/libcap')
| -rw-r--r-- | pkgs/os-specific/linux/libcap/default.nix | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/pkgs/os-specific/linux/libcap/default.nix b/pkgs/os-specific/linux/libcap/default.nix index f00d6272902..8248a628f0a 100644 --- a/pkgs/os-specific/linux/libcap/default.nix +++ b/pkgs/os-specific/linux/libcap/default.nix @@ -1,5 +1,4 @@ -{ stdenv, buildPackages, fetchurl, attr, perl, pam ? null }: -assert pam != null -> stdenv.isLinux; +{ stdenv, buildPackages, fetchurl, attr, perl, pam }: stdenv.mkDerivation rec { name = "libcap-${version}"; @@ -10,8 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0qjiqc5pknaal57453nxcbz3mn1r4hkyywam41wfcglq3v2qlg39"; }; - outputs = [ "out" "dev" "lib" "man" "doc" ] - ++ stdenv.lib.optional (pam != null) "pam"; + outputs = [ "out" "dev" "lib" "man" "doc" "pam" ]; depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ perl ]; @@ -22,7 +20,7 @@ stdenv.mkDerivation rec { makeFlags = [ "lib=lib" - (stdenv.lib.optional (pam != null) "PAM_CAP=yes") + "PAM_CAP=yes" "BUILD_CC=$(CC_FOR_BUILD)" "CC:=$(CC)" ]; |