From ba9803079c93799f66b0f0ac6800f883e2fb479e Mon Sep 17 00:00:00 2001 From: Maurizio Di Pietro Date: Fri, 6 Jan 2017 11:00:43 +0100 Subject: [PATCH 1/2] chase: avoided using fq attribute names --- pkgs/tools/system/chase/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/system/chase/default.nix b/pkgs/tools/system/chase/default.nix index 15d2b16faee6..ebad69339366 100644 --- a/pkgs/tools/system/chase/default.nix +++ b/pkgs/tools/system/chase/default.nix @@ -14,14 +14,14 @@ stdenv.mkDerivation rec { makeFlags = [ "-e" ]; makeFlagsArray="LIBS=-lgc"; - meta = { + meta = with stdenv.lib ; { description = "Follow a symlink and print out its target file"; longDescription = '' A commandline program that chases symbolic filesystems links to the original file ''; homepage = "https://qa.debian.org/developer.php?login=rotty%40debian.org"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = [ stdenv.lib.maintainers.polyrod ]; - platforms = stdenv.lib.platforms.all; + license = licenses.gpl2Plus; + maintainers = [ maintainers.polyrod ]; + platforms = platforms.all; }; } From 25e34e0baec184668f9322b7050023f66146fcfc Mon Sep 17 00:00:00 2001 From: Maurizio Di Pietro Date: Fri, 6 Jan 2017 11:02:05 +0100 Subject: [PATCH 2/2] sakura: fixed GLib-GIO-ERROR #21698 #21700 --- pkgs/applications/misc/sakura/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/sakura/default.nix b/pkgs/applications/misc/sakura/default.nix index 75866cbb971b..66e40befe7c0 100644 --- a/pkgs/applications/misc/sakura/default.nix +++ b/pkgs/applications/misc/sakura/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, pkgconfig, gtk3, perl, vte, pcre, glib }: +{ stdenv, fetchurl, cmake, pkgconfig, gtk3, perl, vte, pcre, glib , makeWrapper }: stdenv.mkDerivation rec { name = "sakura-${version}"; @@ -11,7 +11,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake perl pkgconfig ]; - buildInputs = [ gtk3 vte pcre glib ]; + buildInputs = [ makeWrapper gtk3 vte pcre glib ]; + + # Wrapper sets path to gsettings-schemata so sakura knows where to find colorchooser, fontchooser ... + postInstall = "wrapProgram $out/bin/sakura --suffix XDG_DATA_DIRS : ${gtk3}/share/gsettings-schemas/${gtk3.name}/"; meta = with stdenv.lib; { description = "A terminal emulator based on GTK and VTE";