diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2019-10-23 16:50:09 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-10-23 16:50:09 +0200 |
commit | 09c9a2de7e75191bebfb3397364809f94195224c (patch) | |
tree | 35c17b91d8f287100f3c7b4713c9b7e6de9705a6 /pkgs/development/compilers | |
parent | 4a979b88718da624dae3b3a35bf9f8527fb22a7c (diff) | |
parent | bea05a08166f3c2e73b2fc2885cc4013abb237ee (diff) | |
download | nixlib-09c9a2de7e75191bebfb3397364809f94195224c.tar nixlib-09c9a2de7e75191bebfb3397364809f94195224c.tar.gz nixlib-09c9a2de7e75191bebfb3397364809f94195224c.tar.bz2 nixlib-09c9a2de7e75191bebfb3397364809f94195224c.tar.lz nixlib-09c9a2de7e75191bebfb3397364809f94195224c.tar.xz nixlib-09c9a2de7e75191bebfb3397364809f94195224c.tar.zst nixlib-09c9a2de7e75191bebfb3397364809f94195224c.zip |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/compilers')
-rw-r--r-- | pkgs/development/compilers/osl/default.nix | 6 | ||||
-rw-r--r-- | pkgs/development/compilers/swi-prolog/default.nix | 55 |
2 files changed, 19 insertions, 42 deletions
diff --git a/pkgs/development/compilers/osl/default.nix b/pkgs/development/compilers/osl/default.nix index e4d3398476e6..26ef76382a3a 100644 --- a/pkgs/development/compilers/osl/default.nix +++ b/pkgs/development/compilers/osl/default.nix @@ -8,13 +8,13 @@ in clangStdenv.mkDerivation rec { # In theory this could use GCC + Clang rather than just Clang, # but https://github.com/NixOS/nixpkgs/issues/29877 stops this name = "openshadinglanguage-${version}"; - version = "1.10.6"; + version = "1.10.7"; src = fetchFromGitHub { owner = "imageworks"; repo = "OpenShadingLanguage"; - rev = "Release-1.10.6"; - sha256 = "1g8g853iq56knlvn1hdsck78by3843vyly9wji5ip41r6i2s0zla"; + rev = "Release-1.10.7"; + sha256 = "15grach34grp8x65sq8xzs2s6nfzjhn4blpfnaicw46jdi4c2w59"; }; cmakeFlags = [ "-DUSE_BOOST_WAVE=ON" "-DENABLERTTI=ON" ]; diff --git a/pkgs/development/compilers/swi-prolog/default.nix b/pkgs/development/compilers/swi-prolog/default.nix index cbcfd7efb405..0140bb401118 100644 --- a/pkgs/development/compilers/swi-prolog/default.nix +++ b/pkgs/development/compilers/swi-prolog/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchgit, jdk, gmp, readline, openssl, unixODBC, zlib +{ stdenv, fetchFromGitHub, jdk, gmp, readline, openssl, unixODBC, zlib , libarchive, db, pcre, libedit, libossp_uuid, libXpm -, libSM, libXt, freetype, pkgconfig, fontconfig, makeWrapper ? stdenv.isDarwin -, git, cacert, cmake, libyaml +, libSM, libXt, freetype, pkgconfig, fontconfig +, cmake, libyaml, Security , libjpeg, libX11, libXext, libXft, libXinerama , extraLibraries ? [ jdk unixODBC libXpm libSM libXt freetype fontconfig ] , extraPacks ? [] @@ -18,58 +18,35 @@ stdenv.mkDerivation { pname = "swi-prolog"; inherit version; - src = fetchgit { - url = "https://github.com/SWI-Prolog/swipl-devel"; + src = fetchFromGitHub { + owner = "SWI-Prolog"; + repo = "swipl-devel"; rev = "V${version}"; sha256 = "0czbrscx2s4079nmwvipp9cnwfny16m3fpnp823llm7wyljchgvq"; + fetchSubmodules = true; }; - buildInputs = [ cacert git cmake gmp readline openssl + nativeBuildInputs = [ cmake pkgconfig ]; + + buildInputs = [ gmp readline openssl libarchive libyaml db pcre libedit libossp_uuid - zlib pkgconfig ] + zlib ] ++ stdenv.lib.optionals (withGui && !stdenv.isDarwin) [ libXpm libX11 libXext libXft libXinerama libjpeg ] ++ extraLibraries - ++ stdenv.lib.optional stdenv.isDarwin makeWrapper; + ++ stdenv.lib.optional stdenv.isDarwin Security; hardeningDisable = [ "format" ]; - configureFlags = [ - "--with-world" - "--enable-gmp" - "--enable-shared" - ]; + cmakeFlags = [ "-DSWIPL_INSTALL_IN_LIB=ON" ]; - installPhase = '' - mkdir -p $out - mkdir build - cd build - ${cmake}/bin/cmake -DCMAKE_INSTALL_PREFIX=$out .. - cd ../ - make - make install - make clean - mkdir -p $out/lib/swipl/pack - '' - + builtins.concatStringsSep "\n" + postInstall = builtins.concatStringsSep "\n" ( builtins.map (packInstall "$out") extraPacks ); - # For macOS: still not fixed in upstream: "abort trap 6" when called - # through symlink, so wrap binary. - # We reinvent wrapProgram here but omit argv0 pass in order to not - # break PAKCS package build. This is also safe for SWI-Prolog, since - # there is no wrapping environment and hence no need to spoof $0 - postInstall = stdenv.lib.optionalString stdenv.isDarwin '' - local prog="$out/bin/swipl" - local hidden="$(dirname "$prog")/.$(basename "$prog")"-wrapped - mv $prog $hidden - makeWrapper $hidden $prog - ''; - meta = { - homepage = http://www.swi-prolog.org/; + homepage = "https://www.swi-prolog.org"; description = "A Prolog compiler and interpreter"; - license = "LGPL"; + license = stdenv.lib.licenses.bsd2; platforms = stdenv.lib.platforms.linux ++ stdenv.lib.optionals (!withGui) stdenv.lib.platforms.darwin; maintainers = [ stdenv.lib.maintainers.meditans ]; |