diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2013-03-14 16:01:53 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2013-03-14 16:01:53 +0100 |
| commit | 9ac8a16277705dd43bc8509c9589910f8ca7abc5 (patch) | |
| tree | b1c25c5da13b3b983a9ef23bf35e909a9512dfdd /pkgs | |
| parent | 00e272a11c246d7c5239244df368dd1c03e9c6ca (diff) | |
| download | nixlib-9ac8a16277705dd43bc8509c9589910f8ca7abc5.tar nixlib-9ac8a16277705dd43bc8509c9589910f8ca7abc5.tar.gz nixlib-9ac8a16277705dd43bc8509c9589910f8ca7abc5.tar.bz2 nixlib-9ac8a16277705dd43bc8509c9589910f8ca7abc5.tar.lz nixlib-9ac8a16277705dd43bc8509c9589910f8ca7abc5.tar.xz nixlib-9ac8a16277705dd43bc8509c9589910f8ca7abc5.tar.zst nixlib-9ac8a16277705dd43bc8509c9589910f8ca7abc5.zip | |
vimprobable2, surf: fix the settings-schemas problem
Note that they still segfault.
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/misc/surf/default.nix | 11 | ||||
| -rw-r--r-- | pkgs/applications/networking/browsers/vimprobable2/default.nix | 18 |
2 files changed, 16 insertions, 13 deletions
diff --git a/pkgs/applications/misc/surf/default.nix b/pkgs/applications/misc/surf/default.nix index 94133e633dd8..d6083da5ce40 100644 --- a/pkgs/applications/misc/surf/default.nix +++ b/pkgs/applications/misc/surf/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, makeWrapper, gtk, webkit, pkgconfig, glib, glib_networking, libsoup, patches ? null}: +{stdenv, fetchurl, makeWrapper, gtk, webkit, pkgconfig, glib, glib_networking, libsoup, gsettings_desktop_schemas, patches ? null}: stdenv.mkDerivation rec { name = "surf-${version}"; @@ -19,13 +19,14 @@ stdenv.mkDerivation rec { # `-lX11' to make sure libX11's store path is in the RPATH NIX_LDFLAGS = "-lX11"; preConfigure = [ ''sed -i "s@PREFIX = /usr/local@PREFIX = $out@g" config.mk'' ]; - installPhase = '' + installPhase = '' make PREFIX=/ DESTDIR=$out install - wrapProgram "$out/bin/surf" --prefix GIO_EXTRA_MODULES : \ - ${glib_networking}/lib/gio/modules + wrapProgram "$out/bin/surf" \ + --prefix GIO_EXTRA_MODULES : ${glib_networking}/lib/gio/modules \ + --prefix XDG_DATA_DIRS : "${gsettings_desktop_schemas}/share" ''; - meta = { + meta = { description = "surf is a simple web browser based on WebKit/GTK+. It is able to display websites and follow links. It supports the XEmbed protocol which makes it possible to embed it in another application. Furthermore, one can point surf to another URI by setting its XProperties."; homepage = http://surf.suckless.org; license = "MIT"; diff --git a/pkgs/applications/networking/browsers/vimprobable2/default.nix b/pkgs/applications/networking/browsers/vimprobable2/default.nix index 7fd352ff6f7a..ee8e4b8434a4 100644 --- a/pkgs/applications/networking/browsers/vimprobable2/default.nix +++ b/pkgs/applications/networking/browsers/vimprobable2/default.nix @@ -1,11 +1,12 @@ -{ stdenv, fetchurl, makeWrapper, glib_networking, gtk, libsoup, libX11, perl, - pkgconfig, webkit }: +{ stdenv, fetchurl, makeWrapper, glib, glib_networking, gtk, libsoup, libX11, perl, + pkgconfig, webkit, gsettings_desktop_schemas }: -stdenv.mkDerivation { - name = "vimprobable2-1.2.0"; +stdenv.mkDerivation rec { + version = "1.2.1"; + name = "vimprobable2-${version}"; src = fetchurl { - url = "mirror://sourceforge/vimprobable/vimprobable2_1.2.0.tar.bz2"; - sha256 = "0fjakrmz1syjwgx01j2icpdv69jgvfl2nlxbj8zxfr8mw0h2wg1f"; + url = "mirror://sourceforge/vimprobable/vimprobable2_${version}.tar.bz2"; + sha256 = "19zx1k3s2gnhzzd2wpyqsk151w9p52ifl64xaz9a6qkgvrxlli8p"; }; # Nixos default ca bundle @@ -17,8 +18,9 @@ stdenv.mkDerivation { installPhase = '' make PREFIX=/ DESTDIR=$out install - wrapProgram "$out/bin/vimprobable2" --prefix GIO_EXTRA_MODULES : \ - ${glib_networking}/lib/gio/modules + wrapProgram "$out/bin/vimprobable2" \ + --prefix GIO_EXTRA_MODULES : "${glib_networking}/lib/gio/modules" \ + --prefix XDG_DATA_DIRS : "${gsettings_desktop_schemas}/share" ''; meta = { |