treewide: stdenv.lib -> lib
This commit is contained in:
@@ -91,7 +91,7 @@ stdenv.mkDerivation rec {
|
||||
description = "Apache HTTPD, the world's most popular web server";
|
||||
homepage = "http://httpd.apache.org/";
|
||||
license = licenses.asl20;
|
||||
platforms = lib.platforms.linux ++ stdenv.lib.platforms.darwin;
|
||||
platforms = lib.platforms.linux ++ lib.platforms.darwin;
|
||||
maintainers = with maintainers; [ lovek323 peti ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -20,6 +20,6 @@ stdenv.mkDerivation rec {
|
||||
description = "A Web server and javax.servlet container";
|
||||
homepage = "https://www.eclipse.org/jetty/";
|
||||
platforms = lib.platforms.all;
|
||||
license = [ lib.licenses.asl20 stdenv.lib.licenses.epl10 ];
|
||||
license = [ lib.licenses.asl20 lib.licenses.epl10 ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
homepage = "https://www.gnu.org/software/pies/";
|
||||
|
||||
platforms = lib.platforms.gnu ++ stdenv.lib.platforms.linux;
|
||||
platforms = lib.platforms.gnu ++ lib.platforms.linux;
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -14,7 +14,7 @@ let
|
||||
mkWith = mkFlag "with-" "without-";
|
||||
mkOther = mkFlag "" "" true;
|
||||
|
||||
shouldUsePkg = pkg: if pkg != null && lib.any (stdenv.lib.meta.platformMatch stdenv.hostPlatform) pkg.meta.platforms then pkg else null;
|
||||
shouldUsePkg = pkg: if pkg != null && lib.any (lib.meta.platformMatch stdenv.hostPlatform) pkg.meta.platforms then pkg else null;
|
||||
|
||||
optPam = shouldUsePkg pam;
|
||||
optLibidn = shouldUsePkg libidn;
|
||||
|
||||
Reference in New Issue
Block a user