diff options
author | Alyssa Ross <hi@alyssa.is> | 2019-03-11 00:43:18 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2019-03-11 00:43:18 +0000 |
commit | a6dea5a6f496ea38f56e3c3b4c5d628361cc029f (patch) | |
tree | 8300ad67b0135e6816ab38a6ac6f8fdaeccda2f0 /nixpkgs/pkgs/development/compilers/ponyc | |
parent | 8779e0045c9f218caeb1dd1bcdc87e2715ed5be5 (diff) | |
parent | 5d3fd3674a66c5b1ada63e2eace140519849c967 (diff) | |
download | nixlib-a6dea5a6f496ea38f56e3c3b4c5d628361cc029f.tar nixlib-a6dea5a6f496ea38f56e3c3b4c5d628361cc029f.tar.gz nixlib-a6dea5a6f496ea38f56e3c3b4c5d628361cc029f.tar.bz2 nixlib-a6dea5a6f496ea38f56e3c3b4c5d628361cc029f.tar.lz nixlib-a6dea5a6f496ea38f56e3c3b4c5d628361cc029f.tar.xz nixlib-a6dea5a6f496ea38f56e3c3b4c5d628361cc029f.tar.zst nixlib-a6dea5a6f496ea38f56e3c3b4c5d628361cc029f.zip |
Merge commit '5d3fd3674a66c5b1ada63e2eace140519849c967'
Diffstat (limited to 'nixpkgs/pkgs/development/compilers/ponyc')
-rw-r--r-- | nixpkgs/pkgs/development/compilers/ponyc/default.nix | 20 | ||||
-rw-r--r-- | nixpkgs/pkgs/development/compilers/ponyc/pony-stable.nix | 8 |
2 files changed, 7 insertions, 21 deletions
diff --git a/nixpkgs/pkgs/development/compilers/ponyc/default.nix b/nixpkgs/pkgs/development/compilers/ponyc/default.nix index fbb4db72bd45..767eafc456c0 100644 --- a/nixpkgs/pkgs/development/compilers/ponyc/default.nix +++ b/nixpkgs/pkgs/development/compilers/ponyc/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation ( rec { name = "ponyc-${version}"; - version = "0.26.0"; + version = "0.27.0"; src = fetchFromGitHub { owner = "ponylang"; repo = "ponyc"; rev = version; - sha256 = "1k1ysqk7j8kpysndps2ic9hprvp0z0d32d6jvqlapjrfccghy7dh"; + sha256 = "11vdfvv9xirfi92y7zza9pqimfx33w74vw7rg5n7l60qqc8y2cla"; }; buildInputs = [ llvm makeWrapper which ]; @@ -25,25 +25,15 @@ stdenv.mkDerivation ( rec { substituteInPlace packages/process/_test.pony \ --replace '=/bin' "${coreutils}/bin" - - # Fix llvm-ar check for darwin - substituteInPlace Makefile \ - --replace "llvm-ar-3.8" "llvm-ar" - # Remove impure system refs substituteInPlace src/libponyc/pkg/package.c \ - --replace "/usr/local/lib" "" - substituteInPlace src/libponyc/pkg/package.c \ + --replace "/usr/local/lib" "" \ --replace "/opt/local/lib" "" for file in `grep -irl '/usr/local/opt/libressl/lib' ./*`; do substituteInPlace $file --replace '/usr/local/opt/libressl/lib' "${stdenv.lib.getLib libressl}/lib" done - # Fix ponypath issue - substituteInPlace Makefile \ - --replace "PONYPATH=." "PONYPATH=.:\$(PONYPATH)" - export LLVM_CONFIG=${llvm}/bin/llvm-config '' + stdenv.lib.optionalString ((!stdenv.isDarwin) && (!cc.isClang) && lto) '' export LTO_PLUGIN=`find ${cc.cc}/ -name liblto_plugin.so` @@ -73,9 +63,7 @@ stdenv.mkDerivation ( rec { wrapProgram $out/bin/ponyc \ --prefix PATH ":" "${stdenv.cc}/bin" \ --set-default CC "$CC" \ - --prefix PONYPATH : "$out/lib" \ - --prefix PONYPATH : "${stdenv.lib.getLib pcre2}/lib" \ - --prefix PONYPATH : "${stdenv.lib.getLib libressl}/lib" + --prefix PONYPATH : "${stdenv.lib.makeLibraryPath [ pcre2 libressl (placeholder "out") ]}" ''; # Stripping breaks linking for ponyc diff --git a/nixpkgs/pkgs/development/compilers/ponyc/pony-stable.nix b/nixpkgs/pkgs/development/compilers/ponyc/pony-stable.nix index 6dfb099242d6..821a9b8125cd 100644 --- a/nixpkgs/pkgs/development/compilers/ponyc/pony-stable.nix +++ b/nixpkgs/pkgs/development/compilers/ponyc/pony-stable.nix @@ -2,20 +2,18 @@ stdenv.mkDerivation rec { name = "pony-stable-${version}"; - version = "0.1.6"; + version = "0.2.0"; src = fetchFromGitHub { owner = "ponylang"; repo = "pony-stable"; rev = version; - sha256 = "02lqba75psnxcxj2y8lm1fy1hmwa088nvxjghhpnlkqbwz7wa2sw"; + sha256 = "0zzcq0vsl6kcrsxwqzd3s9mq7aq5sg8si5c83rxyi9n6a06gnbh7"; }; buildInputs = [ ponyc ]; - installPhase = '' - make prefix=$out install - ''; + installFlags = [ "prefix=${placeholder "out"}" "install" ]; meta = { description = "A simple dependency manager for the Pony language."; |