From 50493458bd0b4f3051cf200e165c007efe7dbade Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 7 Dec 2013 14:04:50 +0100 Subject: [PATCH] gnome3.gnome-menus: fix file path, add maintainer Also some whitespace nitpicks. --- lib/maintainers.nix | 1 + .../core/gnome-menus/{default .nix => default.nix} | 9 ++++----- pkgs/desktops/gnome-3/default.nix | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) rename pkgs/desktops/gnome-3/core/gnome-menus/{default .nix => default.nix} (81%) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 0418337b217b..285197e381df 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -49,6 +49,7 @@ rickynils = "Rickard Nilsson "; rob = "Rob Vermaas "; roconnor = "Russell O'Connor "; + roelof = "Roelof Wobben "; sander = "Sander van der Burg "; shlevy = "Shea Levy "; simons = "Peter Simons "; diff --git a/pkgs/desktops/gnome-3/core/gnome-menus/default .nix b/pkgs/desktops/gnome-3/core/gnome-menus/default.nix similarity index 81% rename from pkgs/desktops/gnome-3/core/gnome-menus/default .nix rename to pkgs/desktops/gnome-3/core/gnome-menus/default.nix index fe332355626b..a8e77a32bdc0 100644 --- a/pkgs/desktops/gnome-3/core/gnome-menus/default .nix +++ b/pkgs/desktops/gnome-3/core/gnome-menus/default.nix @@ -1,23 +1,22 @@ -{ stdenv, fetchurl, intltool, pkgconfig, glib}: +{ stdenv, fetchurl, intltool, pkgconfig, glib }: let version = "3.10.1"; in stdenv.mkDerivation { name = "gnome-menus-${version}"; - + src = fetchurl { url = "http://ftp.gnome.org/pub/gnome/sources/gnome-menus/3.10/gnome-menus-3.10.1.tar.xz"; sha256 = "0wcacs1vk3pld8wvrwq7fdrm11i56nrajkrp6j1da6jc4yx0m5a6"; }; - - + preBuild = "patchShebangs ./scripts"; buildInputs=[ intltool pkgconfig glib ]; meta = { homepage = "http://www.gnome.org"; - description = "Gnome menu specification " ; + description = "Gnome menu specification"; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index 13fca9f0ab04..48f37f6ba9d3 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -24,7 +24,7 @@ rec { gnome_icon_theme = callPackage ./core/gnome-icon-theme { }; - gnome-menus = callPackage ../core/gnome-menus{ } ; + gnome-menus = callPackage ./core/gnome-menus { }; gnome_keyring = callPackage ./core/gnome-keyring { }; libgnome_keyring = callPackage ./core/libgnome-keyring { };