summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorMichael Raskin <7c6f434c@mail.ru>2010-06-05 21:14:41 +0000
committerMichael Raskin <7c6f434c@mail.ru>2010-06-05 21:14:41 +0000
commit43790aa2dca88dd964f8a6d99d14e5a9445671e9 (patch)
tree2e7e5d5489fb85214100572142bdeed311db4603 /pkgs
parent5d10c4f9b945d3edc84e30de315ef4a34424e8bb (diff)
downloadnixlib-43790aa2dca88dd964f8a6d99d14e5a9445671e9.tar
nixlib-43790aa2dca88dd964f8a6d99d14e5a9445671e9.tar.gz
nixlib-43790aa2dca88dd964f8a6d99d14e5a9445671e9.tar.bz2
nixlib-43790aa2dca88dd964f8a6d99d14e5a9445671e9.tar.lz
nixlib-43790aa2dca88dd964f8a6d99d14e5a9445671e9.tar.xz
nixlib-43790aa2dca88dd964f8a6d99d14e5a9445671e9.tar.zst
nixlib-43790aa2dca88dd964f8a6d99d14e5a9445671e9.zip
Fixing Gnokii build
svn path=/nixpkgs/trunk/; revision=22160
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/tools/misc/gnokii/default.nix1
-rw-r--r--pkgs/top-level/all-packages.nix3
2 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/tools/misc/gnokii/default.nix b/pkgs/tools/misc/gnokii/default.nix
index 5687195505a4..1a16a9bb0574 100644
--- a/pkgs/tools/misc/gnokii/default.nix
+++ b/pkgs/tools/misc/gnokii/default.nix
@@ -5,6 +5,7 @@ let
   s = import ./src-for-default.nix; 
   buildInputs = with a; [
     perl intltool gettext libusb
+    glib pkgconfig
   ];
 in
 rec {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4eb79b9e3602..0be5a180361a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -810,7 +810,8 @@ let
   };
 
   gnokii = builderDefsPackage (import ../tools/misc/gnokii) {
-    inherit intltool perl gettext libusb;
+    inherit intltool perl gettext libusb pkgconfig;
+    inherit (gtkLibs) glib;
   };
 
   gnugrep = useFromStdenv "gnugrep"