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/applications/graphics | |
| parent | fd1867ec922cfa228cb73494c3a39e7031da01d8 (diff) | |
| download | nixpkgs-68fe867e195626ede48975ea6d65a239392b4ca2.tar nixpkgs-68fe867e195626ede48975ea6d65a239392b4ca2.tar.gz nixpkgs-68fe867e195626ede48975ea6d65a239392b4ca2.tar.bz2 nixpkgs-68fe867e195626ede48975ea6d65a239392b4ca2.tar.lz nixpkgs-68fe867e195626ede48975ea6d65a239392b4ca2.tar.xz nixpkgs-68fe867e195626ede48975ea6d65a239392b4ca2.tar.zst nixpkgs-68fe867e195626ede48975ea6d65a239392b4ca2.zip | |
Get rid of most references to gtkLibs
svn path=/nixpkgs/trunk/; revision=33088
Diffstat (limited to 'pkgs/applications/graphics')
| -rw-r--r-- | pkgs/applications/graphics/gimp/plugins/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/applications/graphics/k3d/default.nix | 14 |
2 files changed, 8 insertions, 9 deletions
diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix index b80d27bfcf9..70a27030969 100644 --- a/pkgs/applications/graphics/gimp/plugins/default.nix +++ b/pkgs/applications/graphics/gimp/plugins/default.nix @@ -5,8 +5,7 @@ { pkgs, gimp }: let - inherit (pkgs) stdenv fetchurl pkgconfig gtkLibs; - inherit (gtkLibs) glib; + inherit (pkgs) stdenv fetchurl pkgconfig glib; targetPluginDir = "$out/${gimp.name}-plugins"; targetScriptDir = "$out/${gimp.name}-scripts"; prefix = "plugin-gimp-"; diff --git a/pkgs/applications/graphics/k3d/default.nix b/pkgs/applications/graphics/k3d/default.nix index c1579579d81..db6288f4cf1 100644 --- a/pkgs/applications/graphics/k3d/default.nix +++ b/pkgs/applications/graphics/k3d/default.nix @@ -1,14 +1,14 @@ -{stdenv, fetchurl, gtkLibs, gnome - , cmake, mesa, zlib, python, expat, libxml2, libsigcxx, libuuid, freetype - , libpng, boost, doxygen, cairomm, pkgconfig, imagemagick, libjpeg, libtiff - , gettext, intltool, perl - }: +{stdenv, fetchurl +, cmake, mesa, zlib, python, expat, libxml2, libsigcxx, libuuid, freetype +, libpng, boost, doxygen, cairomm, pkgconfig, imagemagick, libjpeg, libtiff +, gettext, intltool, perl, gtkmm, glibmm, gtkglext +}: stdenv.mkDerivation rec { version = "0.8.0.2"; name = "k3d-${version}"; src = fetchurl { - url = "http://downloads.sourceforge.net/project/k3d/K-3D%20Source/K-3D%200.8.0.2/k3d-source-0.8.0.2.tar.bz2"; + url = "mirror://sourceforge/k3d/k3d-source-0.8.0.2.tar.bz2"; sha256 = "01fd2qb0zddif3wz1a2wdmwyzn81cf73678qp2gjs8iikmdz6w7x"; }; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { export LD_LIBRARY_PATH="$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD/build/lib" ''; - buildInputs = with gtkLibs; with gnome; [ + buildInputs = [ cmake mesa zlib python expat libxml2 libsigcxx libuuid freetype libpng boost doxygen cairomm pkgconfig imagemagick libjpeg libtiff gettext intltool perl |