diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2015-09-23 10:38:44 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2015-09-23 10:42:34 +0200 |
| commit | 76ef7a93e302a4a92954e4b40863c6702df5ac8d (patch) | |
| tree | 421a74c886dadc0001b7f42a78ad2cf8b1a5de6f /pkgs/applications/office | |
| parent | 6b0add86b99f7d03f6bc80c1742f79e80b9ae413 (diff) | |
| parent | eb09b1fd856e7346d60188b2df64fdfe758c2fc4 (diff) | |
Merge: xlibs and x11 attribute cleanup
Frequently using multiple *almost* identical attributes is bad.
Diffstat (limited to 'pkgs/applications/office')
| -rw-r--r-- | pkgs/applications/office/mendeley/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/office/zotero/default.nix | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/applications/office/mendeley/default.nix b/pkgs/applications/office/mendeley/default.nix index b0c3e58cfbb62..ea6d565a10ba4 100644 --- a/pkgs/applications/office/mendeley/default.nix +++ b/pkgs/applications/office/mendeley/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, dpkg, makeWrapper, which -,gcc, xlibs, qt4, zlib +,gcc, xorg, qt4, zlib , ...}: assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; @@ -24,7 +24,7 @@ let deps = [ gcc.cc qt4 - xlibs.libX11 + xorg.libX11 zlib ]; diff --git a/pkgs/applications/office/zotero/default.nix b/pkgs/applications/office/zotero/default.nix index 9283072c0c1b9..be1729b57c918 100644 --- a/pkgs/applications/office/zotero/default.nix +++ b/pkgs/applications/office/zotero/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, bash, firefox, perl, unzipNLS, xlibs }: +{ stdenv, fetchurl, bash, firefox, perl, unzipNLS, xorg }: let |