public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

treewide: explicitly specify gtk and related package versions

Browse Source
This commit is contained in:
Kirill Boltaev
2016-09-12 18:26:06 +03:00
parent 30107249b1
commit bccd75094f
339 changed files with 893 additions and 872 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/security/jd-gui/default.nix
+2 -2
View File
@@ -1,8 +1,8 @@
{ stdenv, fetchurl, gtk, atk, gdk_pixbuf, pango, makeWrapper }:
{ stdenv, fetchurl, gtk2, atk, gdk_pixbuf, pango, makeWrapper }:
let
dynlibPath = stdenv.lib.makeLibraryPath
[ gtk atk gdk_pixbuf pango ];
[ gtk2 atk gdk_pixbuf pango ];
in
stdenv.mkDerivation rec {
name = "jd-gui-${version}";
pkgs/tools/security/nmap/default.nix
+3 -3
View File
@@ -9,7 +9,7 @@
with stdenv.lib;
let
inherit (pythonPackages) python pygtk pygobject pycairo pysqlite;
inherit (pythonPackages) python pygtk pygobject2 pycairo pysqlite;
in stdenv.mkDerivation rec {
name = "nmap${optionalString graphicalSupport "-graphical"}-${version}";
version = "7.12";
@@ -26,12 +26,12 @@ in stdenv.mkDerivation rec {
postInstall = ''
wrapProgram $out/bin/ndiff --prefix PYTHONPATH : "$(toPythonPath $out)" --prefix PYTHONPATH : "$PYTHONPATH"
'' + optionalString graphicalSupport ''
wrapProgram $out/bin/zenmap --prefix PYTHONPATH : "$(toPythonPath $out)" --prefix PYTHONPATH : "$PYTHONPATH" --prefix PYTHONPATH : $(toPythonPath ${pygtk})/gtk-2.0 --prefix PYTHONPATH : $(toPythonPath ${pygobject})/gtk-2.0 --prefix PYTHONPATH : $(toPythonPath ${pycairo})/gtk-2.0
wrapProgram $out/bin/zenmap --prefix PYTHONPATH : "$(toPythonPath $out)" --prefix PYTHONPATH : "$PYTHONPATH" --prefix PYTHONPATH : $(toPythonPath ${pygtk})/gtk-2.0 --prefix PYTHONPATH : $(toPythonPath ${pygobject2})/gtk-2.0 --prefix PYTHONPATH : $(toPythonPath ${pycairo})/gtk-2.0
'';
buildInputs = [ libpcap pkgconfig openssl makeWrapper python ]
++ optionals graphicalSupport [
libX11 gtk pygtk pysqlite pygobject pycairo
libX11 gtk pygtk pysqlite pygobject2 pycairo
];
meta = {
pkgs/tools/security/tor/torbrowser.nix
+2 -2
View File
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, makeDesktopItem
, libXrender, libX11, libXext, libXt, alsaLib, dbus, dbus_glib, glib, gtk
, libXrender, libX11, libXext, libXt, alsaLib, dbus, dbus_glib, glib, gtk2
, atk, pango, freetype, fontconfig, gdk_pixbuf, cairo, zlib
}:
let
libPath = stdenv.lib.makeLibraryPath [
stdenv.cc.cc zlib glib alsaLib dbus dbus_glib gtk atk pango freetype
stdenv.cc.cc zlib glib alsaLib dbus dbus_glib gtk2 atk pango freetype
fontconfig gdk_pixbuf cairo libXrender libX11 libXext libXt
];
in