diff options
author | Lluís Batlle i Rossell <viric@viric.name> | 2018-07-28 19:25:14 +0200 |
---|---|---|
committer | Lluís Batlle i Rossell <viric@viric.name> | 2018-07-28 19:25:14 +0200 |
commit | f54b387b63299245092d9bbf09cb562bac125461 (patch) | |
tree | 0c09809c0964d7bd931c6c8d1a7d19dcac342abd /pkgs/applications/networking/instant-messengers | |
parent | 66d7126255b96a3d9c1cc0cdd7c2cd79d1789758 (diff) | |
parent | 0fa2cbf59f7f68a8b9213a9cf9d2cd6dd2e518cc (diff) | |
download | nixlib-f54b387b63299245092d9bbf09cb562bac125461.tar nixlib-f54b387b63299245092d9bbf09cb562bac125461.tar.gz nixlib-f54b387b63299245092d9bbf09cb562bac125461.tar.bz2 nixlib-f54b387b63299245092d9bbf09cb562bac125461.tar.lz nixlib-f54b387b63299245092d9bbf09cb562bac125461.tar.xz nixlib-f54b387b63299245092d9bbf09cb562bac125461.tar.zst nixlib-f54b387b63299245092d9bbf09cb562bac125461.zip |
Merge remote-tracking branch 'central/master' into viric_clean
Diffstat (limited to 'pkgs/applications/networking/instant-messengers')
-rw-r--r-- | pkgs/applications/networking/instant-messengers/pidgin/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/applications/networking/instant-messengers/pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/default.nix index 430357cc666a..ec3bb6a463e6 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/default.nix @@ -77,6 +77,6 @@ let unwrapped = stdenv.mkDerivation rec { in if plugins == [] then unwrapped else import ./wrapper.nix { - inherit stdenv makeWrapper symlinkJoin plugins; + inherit makeWrapper symlinkJoin plugins; pidgin = unwrapped; } |