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

Merge pull request #100 from ierton/smironov

Browse Source 
Please, merge my commits
This commit is contained in:
Mathijs Kwik 2012-08-14 22:09:25 -07:00
commit 8a53159a32
4 changed files with 53 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
pkgs/applications/misc/gxneur/default.nix Normal file
View File

@ -0,0 +1,24 @@
{ stdenv, fetchurl, pkgconfig, gtk2, xorg, glib, xneur_0_13, libglade, GConf, pcre }:
stdenv.mkDerivation {
name = "gxneur-0.13.0";
src = fetchurl {
url = http://dists.xneur.ru/release-0.13.0/tgz/gxneur-0.13.0.tar.bz2;
sha256 = "f093428a479158247a7ff8424f0aec9af9f7b1d05b191cf30b7c534965a6839f";
};
buildInputs = [
xorg.libX11 pkgconfig glib gtk2 xorg.libXpm xorg.libXt xorg.libXext xneur_0_13
libglade GConf pcre
];
preConfigure = ''
sed -e 's@-Werror@@' -i configure
sed -e 's@"xneur"@"${xneur_0_13}/bin/xneur"@' -i src/misc.c
'';
meta = {
description = "GUI for XNEUR keyboard layout switcher";
};
}

4
pkgs/desktops/xfce-4.8/support/gvfs.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, glib, dbus, intltool, udev, libgdu }:
{ stdenv, fetchurl, pkgconfig, glib, dbus, intltool, udev, libgdu, fuse }:
stdenv.mkDerivation rec {
name = "gvfs-1.8.2";
@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "0895ac8f6d416e1b15433b6b6b68eb119c6e8b04fdb66db665d684355ef89345";
};
buildInputs = [ pkgconfig glib dbus.libs intltool udev libgdu ];
buildInputs = [ pkgconfig glib dbus.libs intltool udev libgdu fuse ];
meta = {
description = "Virtual Filesystem support library (for Xfce)";

18
pkgs/tools/archivers/atool/default.nix Normal file
View File

@ -0,0 +1,18 @@
{stdenv, fetchurl, perl}:
stdenv.mkDerivation rec {
name = "atool-0.39";
src = fetchurl {
url = http://savannah.nongnu.org/download/atool/atool-0.39.0.tar.gz;
sha256 = "aaf60095884abb872e25f8e919a8a63d0dabaeca46faeba87d12812d6efc703b";
};
buildInputs = [ perl ];
meta = {
homepage = http://www.nongnu.org/atool;
description = "Archive command line helper";
platforms = stdenv.lib.platforms.all;
};
}

10
pkgs/top-level/all-packages.nix
View File

@ -492,6 +492,8 @@ let
inherit (haskellPackages) pandoc;
};
atool = callPackage ../tools/archivers/atool { };
bzip2 = callPackage ../tools/compression/bzip2 { };
cabextract = callPackage ../tools/archivers/cabextract { };
@ -7817,10 +7819,16 @@ let
xineUI = callPackage ../applications/video/xine-ui { };
xneur = callPackage ../applications/misc/xneur { };
xneur_0_13 = callPackage ../applications/misc/xneur { };
xneur_0_8 = callPackage ../applications/misc/xneur/0.8.nix { };
xneur = xneur_0_13;
gxneur = callPackage ../applications/misc/gxneur {
inherit (gnome) libglade GConf;
};
xournal = callPackage ../applications/graphics/xournal {
inherit (gnome) libgnomeprint libgnomeprintui libgnomecanvas;
};