diff options
Diffstat (limited to 'nixpkgs/pkgs/development/compilers/ponyc')
3 files changed, 16 insertions, 18 deletions
diff --git a/nixpkgs/pkgs/development/compilers/ponyc/default.nix b/nixpkgs/pkgs/development/compilers/ponyc/default.nix index 0bfaba914a7b..3a2e3c4b944c 100644 --- a/nixpkgs/pkgs/development/compilers/ponyc/default.nix +++ b/nixpkgs/pkgs/development/compilers/ponyc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchurl, makeWrapper, pcre2, coreutils, which, libressl, libxml2, cmake, z3, substituteAll, +{ lib, stdenv, fetchFromGitHub, fetchurl, makeWrapper, pcre2, coreutils, which, libressl, libxml2, cmake, z3, substituteAll, cc ? stdenv.cc, lto ? !stdenv.isDarwin }: stdenv.mkDerivation (rec { @@ -29,7 +29,8 @@ stdenv.mkDerivation (rec { name = "v1.5.0.tar.gz"; }; - buildInputs = [ makeWrapper which libxml2 cmake z3 ]; + nativeBuildInputs = [ cmake makeWrapper which ]; + buildInputs = [ libxml2 z3 ]; propagatedBuildInputs = [ cc ]; # Sandbox disallows network access, so disabling problematic networking tests @@ -79,31 +80,28 @@ stdenv.mkDerivation (rec { "PONYC_VERSION=${version}" "prefix=${placeholder "out"}" ] - ++ stdenv.lib.optionals stdenv.isDarwin [ "bits=64" ] - ++ stdenv.lib.optionals (stdenv.isDarwin && (!lto)) [ "lto=no" ]; - - enableParallelBuilding = true; + ++ lib.optionals stdenv.isDarwin [ "bits=64" ] + ++ lib.optionals (stdenv.isDarwin && (!lto)) [ "lto=no" ]; doCheck = true; NIX_CFLAGS_COMPILE = [ "-Wno-error=redundant-move" "-Wno-error=implicit-fallthrough" ]; - installPhase = '' - make config=release prefix=$out '' - + stdenv.lib.optionalString stdenv.isDarwin '' bits=64 '' - + stdenv.lib.optionalString (stdenv.isDarwin && (!lto)) '' lto=no '' + installPhase = "make config=release prefix=$out " + + lib.optionalString stdenv.isDarwin "bits=64 " + + lib.optionalString (stdenv.isDarwin && (!lto)) "lto=no " + '' install wrapProgram $out/bin/ponyc \ --prefix PATH ":" "${stdenv.cc}/bin" \ --set-default CC "$CC" \ - --prefix PONYPATH : "${stdenv.lib.makeLibraryPath [ pcre2 libressl (placeholder "out") ]}" + --prefix PONYPATH : "${lib.makeLibraryPath [ pcre2 libressl (placeholder "out") ]}" ''; # Stripping breaks linking for ponyc dontStrip = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Pony is an Object-oriented, actor-model, capabilities-secure, high performance programming language"; homepage = "https://www.ponylang.org"; license = licenses.bsd2; diff --git a/nixpkgs/pkgs/development/compilers/ponyc/pony-corral.nix b/nixpkgs/pkgs/development/compilers/ponyc/pony-corral.nix index 7cf3000e9db1..5da1ec77016c 100644 --- a/nixpkgs/pkgs/development/compilers/ponyc/pony-corral.nix +++ b/nixpkgs/pkgs/development/compilers/ponyc/pony-corral.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, ponyc }: +{ lib, stdenv, fetchFromGitHub, ponyc }: stdenv.mkDerivation ( rec { pname = "corral"; @@ -15,7 +15,7 @@ stdenv.mkDerivation ( rec { installFlags = [ "prefix=${placeholder "out"}" "install" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Corral is a dependency management tool for ponylang (ponyc)"; homepage = "https://www.ponylang.io"; license = licenses.bsd2; diff --git a/nixpkgs/pkgs/development/compilers/ponyc/pony-stable.nix b/nixpkgs/pkgs/development/compilers/ponyc/pony-stable.nix index 3c1b2a0f91b4..8e5810508971 100644 --- a/nixpkgs/pkgs/development/compilers/ponyc/pony-stable.nix +++ b/nixpkgs/pkgs/development/compilers/ponyc/pony-stable.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, ponyc }: +{lib, stdenv, fetchFromGitHub, ponyc }: stdenv.mkDerivation rec { pname = "pony-stable"; @@ -18,8 +18,8 @@ stdenv.mkDerivation rec { meta = { description = "A simple dependency manager for the Pony language"; homepage = "https://www.ponylang.org"; - license = stdenv.lib.licenses.bsd2; - maintainers = with stdenv.lib.maintainers; [ dipinhora kamilchm patternspandemic ]; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ dipinhora kamilchm patternspandemic ]; + platforms = lib.platforms.unix; }; } |