diff options
| author | Maximilian Bosch <maximilian@mbosch.me> | 2020-01-31 07:42:39 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-31 07:42:39 +0100 |
| commit | 645ea323d71ad3ebc3524da3519ba6696685b126 (patch) | |
| tree | a93150b2abdd568d7e086b208bfaa16a003b5b63 /pkgs/applications | |
| parent | f64307a00dfa4e5b8e54733aff28468efd77875c (diff) | |
| parent | f73d7259677b508efa5723a64ffbe0ea45634692 (diff) | |
| download | nixlib-645ea323d71ad3ebc3524da3519ba6696685b126.tar nixlib-645ea323d71ad3ebc3524da3519ba6696685b126.tar.gz nixlib-645ea323d71ad3ebc3524da3519ba6696685b126.tar.bz2 nixlib-645ea323d71ad3ebc3524da3519ba6696685b126.tar.lz nixlib-645ea323d71ad3ebc3524da3519ba6696685b126.tar.xz nixlib-645ea323d71ad3ebc3524da3519ba6696685b126.tar.zst nixlib-645ea323d71ad3ebc3524da3519ba6696685b126.zip | |
Merge pull request #77989 from lblasc/llvm3-removal
llvm: remove 3.5, 3.8 and 4
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/misc/lutris/chrootenv.nix | 2 | ||||
| -rw-r--r-- | pkgs/applications/science/logic/saw-tools/default.nix | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/applications/misc/lutris/chrootenv.nix b/pkgs/applications/misc/lutris/chrootenv.nix index 086128508866..5b9bb925a4e6 100644 --- a/pkgs/applications/misc/lutris/chrootenv.nix +++ b/pkgs/applications/misc/lutris/chrootenv.nix @@ -69,7 +69,7 @@ in buildFHSUserEnv { flac # rpcs3 // TODO: "error while loading shared libraries: libz.so.1..." - llvm_4 + llvm # ScummVM nasm sndio diff --git a/pkgs/applications/science/logic/saw-tools/default.nix b/pkgs/applications/science/logic/saw-tools/default.nix index c4041281054f..71b26f8023a2 100644 --- a/pkgs/applications/science/logic/saw-tools/default.nix +++ b/pkgs/applications/science/logic/saw-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gmp4, ncurses, zlib, clang_35 }: +{ stdenv, fetchurl, gmp4, ncurses, zlib, clang }: let libPath = stdenv.lib.makeLibraryPath @@ -38,7 +38,7 @@ stdenv.mkDerivation { ln -s ${stdenv.cc.libc}/lib/libpthread.so.0 $out/lib/libpthread.so.0 # Add a clang symlink for easy building with a suitable compiler. - ln -s ${clang_35}/bin/clang $out/bin/saw-clang + ln -s ${clang}/bin/clang $out/bin/saw-clang ''; fixupPhase = '' |