From 83a2e8554bd824663a59ca8eec277acf202ba480 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 18 Jan 2014 11:39:30 +0100 Subject: [PATCH] spacefm: fix schema-crash (in preferences), nitpicks I also did some style changes to be closer to most in nixpkgs. --- pkgs/applications/misc/spacefm/default.nix | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/misc/spacefm/default.nix b/pkgs/applications/misc/spacefm/default.nix index fa3423cd8c4c..6d52f63ff6b4 100644 --- a/pkgs/applications/misc/spacefm/default.nix +++ b/pkgs/applications/misc/spacefm/default.nix @@ -1,21 +1,27 @@ -{ pkgs, fetchurl, stdenv, gtk3, udev, desktop_file_utils, shared_mime_info, intltool, pkgconfig }: +{ pkgs, fetchurl, stdenv, gtk3, udev, desktop_file_utils, shared_mime_info +, intltool, pkgconfig, makeWrapper +}: let - name = "spacefm-${version}"; version = "0.9.2"; -in stdenv.mkDerivation { - inherit name; +in stdenv.mkDerivation rec { + name = "spacefm-${version}"; src = fetchurl { - url="https://github.com/IgnorantGuru/spacefm/blob/pkg/${version}/${name}.tar.xz?raw=true"; - sha256 ="3767137d74aa78597ffb42a6121784e91a4276efcd5d718b3793b9790f82268c"; + url = "https://github.com/IgnorantGuru/spacefm/blob/pkg/${version}/${name}.tar.xz?raw=true"; + sha256 = "3767137d74aa78597ffb42a6121784e91a4276efcd5d718b3793b9790f82268c"; }; - buildInputs = [ gtk3 udev desktop_file_utils shared_mime_info intltool pkgconfig ]; + buildInputs = [ gtk3 udev desktop_file_utils shared_mime_info intltool pkgconfig makeWrapper ]; + + postInstall = '' + wrapProgram "$out/bin/spacefm" \ + --prefix XDG_DATA_DIRS : "${gtk3}/share" + ''; meta = { - description = "SpaceFM is a multi-panel tabbed file and desktop manager for Linux with built-in VFS, udev- or HAL-based device manager, customizable menu system, and bash integration."; + description = "Multi-panel tabbed file and desktop manager for Linux with built-in VFS, udev- or HAL-based device manager, customizable menu system, and bash integration."; platforms = pkgs.lib.platforms.linux; license = pkgs.lib.licenses.gpl3; };