diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-07-10 08:52:50 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-07-10 08:52:50 +0200 |
| commit | da96a4119feeaaa4df32788aa28422a5703743b4 (patch) | |
| tree | 88217e9530938795337cc4ec06284d4e2e6201d9 /pkgs/development/compilers | |
| parent | 79a03641d58f351454051bf2320e94508525a41b (diff) | |
| parent | 7f23e982d19c36e72e40bb5cee73649e9e85f29d (diff) | |
| download | nixlib-da96a4119feeaaa4df32788aa28422a5703743b4.tar nixlib-da96a4119feeaaa4df32788aa28422a5703743b4.tar.gz nixlib-da96a4119feeaaa4df32788aa28422a5703743b4.tar.bz2 nixlib-da96a4119feeaaa4df32788aa28422a5703743b4.tar.lz nixlib-da96a4119feeaaa4df32788aa28422a5703743b4.tar.xz nixlib-da96a4119feeaaa4df32788aa28422a5703743b4.tar.zst nixlib-da96a4119feeaaa4df32788aa28422a5703743b4.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/development/compilers')
| -rw-r--r-- | pkgs/development/compilers/dotnet/sdk/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/compilers/ocaml/4.08.nix | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/compilers/dotnet/sdk/default.nix b/pkgs/development/compilers/dotnet/sdk/default.nix index b4f35b1c4c01..6c1fa37e81a4 100644 --- a/pkgs/development/compilers/dotnet/sdk/default.nix +++ b/pkgs/development/compilers/dotnet/sdk/default.nix @@ -28,7 +28,7 @@ in runHook preBuild patchelf --set-interpreter "${stdenv.cc.bintools.dynamicLinker}" ./dotnet patchelf --set-rpath "${rpath}" ./dotnet - find -type f -name "*.so" -exec patchelf --set-rpath "${rpath}" {} \; + find -type f -name "*.so" -exec patchelf --set-rpath '$ORIGIN:${rpath}' {} \; echo -n "dotnet-sdk version: " ./dotnet --version runHook postBuild diff --git a/pkgs/development/compilers/ocaml/4.08.nix b/pkgs/development/compilers/ocaml/4.08.nix index cdc5314f3c77..4f9b8ebd294c 100644 --- a/pkgs/development/compilers/ocaml/4.08.nix +++ b/pkgs/development/compilers/ocaml/4.08.nix @@ -1,8 +1,8 @@ import ./generic.nix { major_version = "4"; minor_version = "08"; - patch_version = "0+rc2"; - sha256 = "09wp2iig6v5pivkjcnibdvkg5mchcj3q4zms6ij67039xczm8qrg"; + patch_version = "0"; + sha256 = "0si976y8snbmhm96671di65z0rrdyldxd55wjxn2mkn6654nryna"; # If the executable is stripped it does not work dontStrip = true; |