diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2017-11-08 14:26:33 -0500 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2017-11-08 14:26:33 -0500 |
| commit | 4c6a1db75643d52585441111f5802e3f179ffa8d (patch) | |
| tree | 6a57a882933f514e1682e606fb61d24ea6dd74a2 /pkgs/applications | |
| parent | 109de2b869be77cbda9c97b81d16bc06307f1f94 (diff) | |
| parent | 4d4f94cde4d3806ca063ebf7e6ba448b0feae355 (diff) | |
| download | nixpkgs-4c6a1db75643d52585441111f5802e3f179ffa8d.tar nixpkgs-4c6a1db75643d52585441111f5802e3f179ffa8d.tar.gz nixpkgs-4c6a1db75643d52585441111f5802e3f179ffa8d.tar.bz2 nixpkgs-4c6a1db75643d52585441111f5802e3f179ffa8d.tar.lz nixpkgs-4c6a1db75643d52585441111f5802e3f179ffa8d.tar.xz nixpkgs-4c6a1db75643d52585441111f5802e3f179ffa8d.tar.zst nixpkgs-4c6a1db75643d52585441111f5802e3f179ffa8d.zip | |
Merge base commit of #30484 into staging
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/editors/jucipp/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/editors/jucipp/default.nix b/pkgs/applications/editors/jucipp/default.nix index ae4f1e6ad52..3d623d3f3bd 100644 --- a/pkgs/applications/editors/jucipp/default.nix +++ b/pkgs/applications/editors/jucipp/default.nix @@ -1,7 +1,7 @@ { config, stdenv, fetchgit, makeWrapper, gnome3, at_spi2_core, libcxx, boost, epoxy, cmake, aspell, llvmPackages, libgit2, pkgconfig, pcre, libXdmcp, libxkbcommon, libpthreadstubs, wrapGAppsHook, aspellDicts, - coreutils, glibc, dbus_libs, openssl, libxml2, gnumake, binutils, ctags }: + coreutils, glibc, dbus_libs, openssl, libxml2, gnumake, ctags }: with stdenv.lib; @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { postInstall = '' mv $out/bin/juci $out/bin/.juci makeWrapper "$out/bin/.juci" "$out/bin/juci" \ - --set PATH "${stdenv.lib.makeBinPath [ ctags coreutils llvmPackages.clang.cc cmake gnumake binutils llvmPackages.clang ]}" \ + --set PATH "${stdenv.lib.makeBinPath [ ctags coreutils llvmPackages.clang.cc cmake gnumake llvmPackages.clang.bintools llvmPackages.clang ]}" \ --set NO_AT_BRIDGE 1 \ --set ASPELL_CONF "dict-dir ${aspellDicts.en}/lib/aspell" ''; |