diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2015-09-15 11:26:18 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2015-09-15 12:54:34 +0200 |
commit | 88c9f8b574ead01e32c5ee5228679723343cd52c (patch) | |
tree | 92196d2055a7842ae40c022581220bace87ab9e1 /pkgs/tools/misc/ocz-ssd-guru/default.nix | |
parent | 21e3ff658ac2d7b7986169f31550aa5f65bb7635 (diff) | |
download | nixpkgs-88c9f8b574ead01e32c5ee5228679723343cd52c.tar nixpkgs-88c9f8b574ead01e32c5ee5228679723343cd52c.tar.gz nixpkgs-88c9f8b574ead01e32c5ee5228679723343cd52c.tar.bz2 nixpkgs-88c9f8b574ead01e32c5ee5228679723343cd52c.tar.lz nixpkgs-88c9f8b574ead01e32c5ee5228679723343cd52c.tar.xz nixpkgs-88c9f8b574ead01e32c5ee5228679723343cd52c.tar.zst nixpkgs-88c9f8b574ead01e32c5ee5228679723343cd52c.zip |
xlibs: replace occurrences by xorg
This seems to have been confusing people, using both xlibs and xorg, etc. - Avoided renaming local (and different) xlibs binding in gcc*. - Fixed cases where both xorg and xlibs were used. Hopefully everything still works as before.
Diffstat (limited to 'pkgs/tools/misc/ocz-ssd-guru/default.nix')
-rw-r--r-- | pkgs/tools/misc/ocz-ssd-guru/default.nix | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/tools/misc/ocz-ssd-guru/default.nix b/pkgs/tools/misc/ocz-ssd-guru/default.nix index 7ee6089c249..21786f3f15f 100644 --- a/pkgs/tools/misc/ocz-ssd-guru/default.nix +++ b/pkgs/tools/misc/ocz-ssd-guru/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, xlibs, freetype, fontconfig, mesa, glibc, makeWrapper }: +{ fetchurl, stdenv, xorg, freetype, fontconfig, mesa, glibc, makeWrapper }: let system = if stdenv.system == "x86_64-linux" then "linux64" else "linux32"; @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { buildInputs = [ makeWrapper ]; libPath = stdenv.lib.makeLibraryPath [ - xlibs.libX11 - xlibs.libxcb + xorg.libX11 + xorg.libxcb freetype fontconfig - xlibs.libXext - xlibs.libXi - xlibs.libXrender + xorg.libXext + xorg.libXi + xorg.libXrender stdenv.cc.cc glibc mesa |