diff options
| author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-03-14 21:57:32 +0000 |
|---|---|---|
| committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-03-14 21:57:32 +0000 |
| commit | 68fe867e195626ede48975ea6d65a239392b4ca2 (patch) | |
| tree | 41b401afa6bca8fb76816fd9d8f856cb3a19a0b5 /pkgs/tools | |
| parent | fd1867ec922cfa228cb73494c3a39e7031da01d8 (diff) | |
Get rid of most references to gtkLibs
svn path=/nixpkgs/trunk/; revision=33088
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/X11/bumblebee/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/admin/gtk-vnc/default.nix | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/tools/X11/bumblebee/default.nix b/pkgs/tools/X11/bumblebee/default.nix index 2e0c700641f72..74e3e7b1f82dc 100644 --- a/pkgs/tools/X11/bumblebee/default.nix +++ b/pkgs/tools/X11/bumblebee/default.nix @@ -28,7 +28,7 @@ # package, and parameterize the two wrappers as well) { stdenv, fetchurl, pkgconfig, help2man -, libX11, glibc, gtkLibs, libbsd +, libX11, glibc, glib, libbsd , makeWrapper, buildEnv, module_init_tools , linuxPackages, virtualgl, xorg, xkeyboard_config }: @@ -98,7 +98,7 @@ in stdenv.mkDerivation { # Build-time dependencies of bumblebeed and optirun. # Note that it has several runtime dependencies. - buildInputs = [ stdenv makeWrapper pkgconfig help2man libX11 gtkLibs.glib libbsd ]; + buildInputs = [ stdenv makeWrapper pkgconfig help2man libX11 glib libbsd ]; # create a wrapper environment for bumblebeed and optirun postInstall = '' diff --git a/pkgs/tools/admin/gtk-vnc/default.nix b/pkgs/tools/admin/gtk-vnc/default.nix index 036389babe23e..1fda870d5fbb8 100644 --- a/pkgs/tools/admin/gtk-vnc/default.nix +++ b/pkgs/tools/admin/gtk-vnc/default.nix @@ -7,7 +7,7 @@ builderDefsPackage (a : let helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ - ["perlPackages" "firefox36Pkgs" "gtkLibs"]; + ["perlPackages" "firefox36Pkgs"]; buildInputs = (map (n: builtins.getAttr n x) (builtins.attrNames (builtins.removeAttrs x helperArgNames))) |