diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-09-08 11:42:09 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-09-08 11:42:09 +0200 |
| commit | 585983bc954d043d40a14b29c0bddca42bb9cdfb (patch) | |
| tree | f64c271969e6fa21b7e3e49da7653a92f2d6face /pkgs/development/tools | |
| parent | ff85b53c5f266a6a7bbcf8b30c4eea7c3f6160ee (diff) | |
| parent | a71744392b6964e624d3ae968bee660731b7d271 (diff) | |
| download | nixlib-585983bc954d043d40a14b29c0bddca42bb9cdfb.tar nixlib-585983bc954d043d40a14b29c0bddca42bb9cdfb.tar.gz nixlib-585983bc954d043d40a14b29c0bddca42bb9cdfb.tar.bz2 nixlib-585983bc954d043d40a14b29c0bddca42bb9cdfb.tar.lz nixlib-585983bc954d043d40a14b29c0bddca42bb9cdfb.tar.xz nixlib-585983bc954d043d40a14b29c0bddca42bb9cdfb.tar.zst nixlib-585983bc954d043d40a14b29c0bddca42bb9cdfb.zip | |
Merge remote-tracking branch 'origin/staging'
Conflicts: pkgs/applications/version-management/subversion/default.nix
Diffstat (limited to 'pkgs/development/tools')
| -rw-r--r-- | pkgs/development/tools/misc/d-feet/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/development/tools/misc/swig/default.nix | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/pkgs/development/tools/misc/d-feet/default.nix b/pkgs/development/tools/misc/d-feet/default.nix index 852c1b742195..df5fdbfab5a3 100644 --- a/pkgs/development/tools/misc/d-feet/default.nix +++ b/pkgs/development/tools/misc/d-feet/default.nix @@ -26,7 +26,6 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/d-feet \ --prefix PYTHONPATH : "$(toPythonPath $out):$(toPythonPath ${pygobject3})" \ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ - --prefix LD_LIBRARY_PATH : "${gtk3}/lib:${atk}/lib:${libwnck3}/lib" \ --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$out/share" rm $out/share/icons/hicolor/icon-theme.cache diff --git a/pkgs/development/tools/misc/swig/default.nix b/pkgs/development/tools/misc/swig/default.nix index 66d6b65453ea..c4fcd3158457 100644 --- a/pkgs/development/tools/misc/swig/default.nix +++ b/pkgs/development/tools/misc/swig/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { # 'make check' uses boost and tcl buildInputs = stdenv.lib.optionals doCheck [ boost tcl ]; - configureFlags = stdenv.lib.optionalString stdenv.isDarwin "--disable-ccache"; + configureFlags = "--disable-ccache"; meta = { description = "Interface compiler that connects C/C++ code to higher-level languages"; |