diff options
| author | Artturin <Artturin@artturin.com> | 2022-05-23 21:28:14 +0300 |
|---|---|---|
| committer | Artturin <Artturin@artturin.com> | 2022-05-25 15:51:20 +0300 |
| commit | 0c4d65b21efd3ae2fcdec54492cbaa6542352eb9 (patch) | |
| tree | d5251369babb3ed450ff99ad79f7c7ce285fe49c /pkgs/applications/editors/eclipse | |
| parent | a05b5817834f553f8eae560c58fed02a59af42b9 (diff) | |
| download | nixlib-0c4d65b21efd3ae2fcdec54492cbaa6542352eb9.tar nixlib-0c4d65b21efd3ae2fcdec54492cbaa6542352eb9.tar.gz nixlib-0c4d65b21efd3ae2fcdec54492cbaa6542352eb9.tar.bz2 nixlib-0c4d65b21efd3ae2fcdec54492cbaa6542352eb9.tar.lz nixlib-0c4d65b21efd3ae2fcdec54492cbaa6542352eb9.tar.xz nixlib-0c4d65b21efd3ae2fcdec54492cbaa6542352eb9.tar.zst nixlib-0c4d65b21efd3ae2fcdec54492cbaa6542352eb9.zip | |
treewide: stdenv.glibc -> glibc
Diffstat (limited to 'pkgs/applications/editors/eclipse')
| -rw-r--r-- | pkgs/applications/editors/eclipse/build-eclipse.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/editors/eclipse/default.nix | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/pkgs/applications/editors/eclipse/build-eclipse.nix b/pkgs/applications/editors/eclipse/build-eclipse.nix index 3b497f34a439..c9bb8168995f 100644 --- a/pkgs/applications/editors/eclipse/build-eclipse.nix +++ b/pkgs/applications/editors/eclipse/build-eclipse.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, makeDesktopItem, freetype, fontconfig, libX11, libXrender +{ lib, stdenv, makeDesktopItem, freetype, fontconfig, libX11, libXrender, glibc , zlib, jdk, glib, glib-networking, gtk, libXtst, libsecret, gsettings-desktop-schemas, webkitgtk , makeWrapper, perl, ... }: @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { tar xfvz $src -C $out # Patch binaries. - interpreter=$(echo ${stdenv.glibc.out}/lib/ld-linux*.so.2) + interpreter=$(echo ${glibc.out}/lib/ld-linux*.so.2) libCairo=$out/eclipse/libcairo-swt.so patchelf --set-interpreter $interpreter $out/eclipse/eclipse [ -f $libCairo ] && patchelf --set-rpath ${lib.makeLibraryPath [ freetype fontconfig libX11 libXrender zlib ]} $libCairo diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix index ea763ecb39ad..b91d12401917 100644 --- a/pkgs/applications/editors/eclipse/default.nix +++ b/pkgs/applications/editors/eclipse/default.nix @@ -6,8 +6,6 @@ , callPackage }: -assert stdenv ? glibc; - # https://download.eclipse.org/eclipse/downloads/ is the main place to # find the downloads needed for new versions # |