Skip to content

Please, merge my commits #100

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bluescreen303 merged 3 commits into from
Aug 15, 2012
Merged

Please, merge my commits #100

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
36f0a97
atool: add archiver helper
ierton Aug 5, 2012
b229c3e
gxneur: add frontend for XNEUR keyboard layout switcher
ierton Aug 14, 2012
7ef3f9d
xfce-gvfs: add fuse to buildInputs
ierton Feb 12, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 24 additions & 0 deletions pkgs/applications/misc/gxneur/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 changes: 2 additions & 2 deletions pkgs/desktops/xfce-4.8/support/gvfs.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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";
Expand All @@ -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)";
Expand Down
18 changes: 18 additions & 0 deletions pkgs/tools/archivers/atool/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 changes: 9 additions & 1 deletion pkgs/top-level/all-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -492,6 +492,8 @@ let
inherit (haskellPackages) pandoc;
};

atool = callPackage ../tools/archivers/atool { };

bzip2 = callPackage ../tools/compression/bzip2 { };

cabextract = callPackage ../tools/archivers/cabextract { };
Expand Down Expand Up @@ -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;
};
Expand Down