about summary refs log tree commit diff
diff options
context:
space:
mode:
authorFranz Pletz <fpletz@fnordicwalking.de>2017-03-07 00:31:04 +0100
committerGitHub <noreply@github.com>2017-03-07 00:31:04 +0100
commitd102115101a91788013f732193340a8e88d0282e (patch)
treef0677bd21a50380934cc6a4490fd4efdbc135252
parent370999952cbdfd1419510e8c5233059e63d628f6 (diff)
parenta5fcca2004524e8603c211cb496e69d81dcd7152 (diff)
downloadnixlib-d102115101a91788013f732193340a8e88d0282e.tar
nixlib-d102115101a91788013f732193340a8e88d0282e.tar.gz
nixlib-d102115101a91788013f732193340a8e88d0282e.tar.bz2
nixlib-d102115101a91788013f732193340a8e88d0282e.tar.lz
nixlib-d102115101a91788013f732193340a8e88d0282e.tar.xz
nixlib-d102115101a91788013f732193340a8e88d0282e.tar.zst
nixlib-d102115101a91788013f732193340a8e88d0282e.zip
Merge pull request #23573 from LnL7/darwin-gss
gss: don't build with shishi on darwin
-rw-r--r--pkgs/development/libraries/gss/default.nix12
1 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/development/libraries/gss/default.nix b/pkgs/development/libraries/gss/default.nix
index a748d9582695..0cc6a07e0839 100644
--- a/pkgs/development/libraries/gss/default.nix
+++ b/pkgs/development/libraries/gss/default.nix
@@ -1,9 +1,9 @@
 { stdenv, fetchurl
-
-# Optional Dependencies
-, shishi ? null
+, withShishi ? !stdenv.isDarwin, shishi ? null
 }:
 
+assert withShishi -> shishi != null;
+
 stdenv.mkDerivation rec {
   name = "gss-1.0.3";
 
@@ -12,16 +12,16 @@ stdenv.mkDerivation rec {
     sha256 = "1syyvh3k659xf1hdv9pilnnhbbhs6vfapayp4xgdcc8mfgf9v4gz";
   };
 
-  buildInputs = [ shishi ];
+  buildInputs = stdenv.lib.optional withShishi shishi;
 
   configureFlags = [
-    "--${if shishi != null then "enable" else "disable"}-kereberos5"
+    "--${if withShishi != null then "enable" else "disable"}-kereberos5"
   ];
 
   doCheck = true;
 
   # Fixup .la files
-  postInstall = stdenv.lib.optionalString (!stdenv.isDarwin && shishi != null) ''
+  postInstall = stdenv.lib.optionalString withShishi ''
     sed -i 's,\(-lshishi\),-L${shishi}/lib \1,' $out/lib/libgss.la
   '';