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

vimprobable2, surf: fix the settings-schemas problem

Browse Source 
Note that they still segfault.
This commit is contained in:
Vladimír Čunát 2013-03-14 16:01:53 +01:00
parent 00e272a11c
commit 9ac8a16277
2 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/applications/misc/surf/default.nix
View File

@ -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 { stdenv.mkDerivation rec {
name = "surf-${version}"; name = "surf-${version}";
@ -21,8 +21,9 @@ stdenv.mkDerivation rec {
preConfigure = [ ''sed -i "s@PREFIX = /usr/local@PREFIX = $out@g" config.mk'' ]; preConfigure = [ ''sed -i "s@PREFIX = /usr/local@PREFIX = $out@g" config.mk'' ];
installPhase = '' installPhase = ''
make PREFIX=/ DESTDIR=$out install make PREFIX=/ DESTDIR=$out install
wrapProgram "$out/bin/surf" --prefix GIO_EXTRA_MODULES : \ wrapProgram "$out/bin/surf" \
${glib_networking}/lib/gio/modules --prefix GIO_EXTRA_MODULES : ${glib_networking}/lib/gio/modules \
--prefix XDG_DATA_DIRS : "${gsettings_desktop_schemas}/share"
''; '';
meta = { meta = {

18
pkgs/applications/networking/browsers/vimprobable2/default.nix
View File

@ -1,11 +1,12 @@
{ stdenv, fetchurl, makeWrapper, glib_networking, gtk, libsoup, libX11, perl, { stdenv, fetchurl, makeWrapper, glib, glib_networking, gtk, libsoup, libX11, perl,
pkgconfig, webkit }: pkgconfig, webkit, gsettings_desktop_schemas }:
stdenv.mkDerivation { stdenv.mkDerivation rec {
name = "vimprobable2-1.2.0"; version = "1.2.1";
name = "vimprobable2-${version}";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/vimprobable/vimprobable2_1.2.0.tar.bz2"; url = "mirror://sourceforge/vimprobable/vimprobable2_${version}.tar.bz2";
sha256 = "0fjakrmz1syjwgx01j2icpdv69jgvfl2nlxbj8zxfr8mw0h2wg1f"; sha256 = "19zx1k3s2gnhzzd2wpyqsk151w9p52ifl64xaz9a6qkgvrxlli8p";
}; };
# Nixos default ca bundle # Nixos default ca bundle
@ -17,8 +18,9 @@ stdenv.mkDerivation {
installPhase = '' installPhase = ''
make PREFIX=/ DESTDIR=$out install make PREFIX=/ DESTDIR=$out install
wrapProgram "$out/bin/vimprobable2" --prefix GIO_EXTRA_MODULES : \ wrapProgram "$out/bin/vimprobable2" \
${glib_networking}/lib/gio/modules --prefix GIO_EXTRA_MODULES : "${glib_networking}/lib/gio/modules" \
--prefix XDG_DATA_DIRS : "${gsettings_desktop_schemas}/share"
''; '';
meta = { meta = {