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

Merge pull request #21700 from polyrod/master

Browse Source 
sakura: fixed GLib-GIO-ERROR #21698
This commit is contained in:
Daiderd Jordan 2017-01-07 01:40:00 +01:00 committed by GitHub
commit 56cceca999
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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 { stdenv.mkDerivation rec {
name = "sakura-${version}"; name = "sakura-${version}";
@ -11,7 +11,10 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake perl pkgconfig ]; 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; { meta = with stdenv.lib; {
description = "A terminal emulator based on GTK and VTE"; description = "A terminal emulator based on GTK and VTE";

8
pkgs/tools/system/chase/default.nix
View File

@ -14,14 +14,14 @@ stdenv.mkDerivation rec {
makeFlags = [ "-e" ]; makeFlags = [ "-e" ];
makeFlagsArray="LIBS=-lgc"; makeFlagsArray="LIBS=-lgc";
meta = { meta = with stdenv.lib ; {
description = "Follow a symlink and print out its target file"; description = "Follow a symlink and print out its target file";
longDescription = '' longDescription = ''
A commandline program that chases symbolic filesystems links to the original file A commandline program that chases symbolic filesystems links to the original file
''; '';
homepage = "https://qa.debian.org/developer.php?login=rotty%40debian.org"; homepage = "https://qa.debian.org/developer.php?login=rotty%40debian.org";
license = stdenv.lib.licenses.gpl2Plus; license = licenses.gpl2Plus;
maintainers = [ stdenv.lib.maintainers.polyrod ]; maintainers = [ maintainers.polyrod ];
platforms = stdenv.lib.platforms.all; platforms = platforms.all;
}; };
} }