summary refs log tree commit diff
diff options
context:
space:
mode:
authorLluís Batlle <viriketo@gmail.com>2012-08-05 13:01:43 +0200
committerLluís Batlle <viriketo@gmail.com>2012-08-05 16:16:55 +0200
commit3d2e1508eed0845fbba57ed0bf134454249f1aae (patch)
tree4910f39e03cbedb2fb6152cc2c8bc6a91d12ee01
parent1229893ebe32f911e1ff5a668ab55ea6481b1b02 (diff)
downloadnixpkgs-3d2e1508eed0845fbba57ed0bf134454249f1aae.tar
nixpkgs-3d2e1508eed0845fbba57ed0bf134454249f1aae.tar.gz
nixpkgs-3d2e1508eed0845fbba57ed0bf134454249f1aae.tar.bz2
nixpkgs-3d2e1508eed0845fbba57ed0bf134454249f1aae.tar.lz
nixpkgs-3d2e1508eed0845fbba57ed0bf134454249f1aae.tar.xz
nixpkgs-3d2e1508eed0845fbba57ed0bf134454249f1aae.tar.zst
nixpkgs-3d2e1508eed0845fbba57ed0bf134454249f1aae.zip
surf: updating to 0.5, and making it build.
It needed webkit_gtk2.
-rw-r--r--pkgs/applications/misc/surf/default.nix4
-rw-r--r--pkgs/top-level/all-packages.nix1
2 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/applications/misc/surf/default.nix b/pkgs/applications/misc/surf/default.nix
index 3164f0c1a94..61d2e6a65bd 100644
--- a/pkgs/applications/misc/surf/default.nix
+++ b/pkgs/applications/misc/surf/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "surf-${version}";
-  version="0.4.1";
+  version="0.5";
 
   src = fetchurl {
     url = "http://dl.suckless.org/surf/surf-${version}.tar.gz";
-    sha256 = "0im5psjw0r8av3zjyy2wqcl6y5ylwnrab5kfcwc23bsbx2irnw4k";
+    sha256 = "19qfkwdk6p5hcwnnplscp1kmypz74mga7x6iqy6w3g18s221f2mx";
   };
 
   buildInputs = [ gtk webkit pkgconfig glib libsoup ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7348082740e..c12d033f1ef 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7556,6 +7556,7 @@ let
 
   surf = callPackage ../applications/misc/surf {
     libsoup = gnome.libsoup;
+    webkit = webkit_gtk2;
   };
 
   svk = perlPackages.SVK;