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

samba, imagemagick: Add missing meta info

This commit is contained in:
Eelco Dolstra 2013-01-06 22:30:23 +01:00
parent 53efca6946
commit 1e9e2cb2bb
4 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/graphics/ImageMagick/default.nix
View File

@ -46,6 +46,8 @@ stdenv.mkDerivation rec {
'' else ""; '' else "";
meta = { meta = {
homepage = http://www.imagemagick.org; homepage = http://www.imagemagick.org/;
description = "A software suite to create, edit, compose, or convert bitmap images";
platforms = stdenv.lib.platforms.linux;
}; };
} }

6
pkgs/servers/samba/default.nix
View File

@ -75,4 +75,10 @@ stdenv.mkDerivation rec {
cp ../examples/LDAP/samba.schema $out/etc/openldap/schema cp ../examples/LDAP/samba.schema $out/etc/openldap/schema
'' # */ '' # */
+ stdenv.lib.optionalString (configDir == "") "touch $out/lib/smb.conf"; + stdenv.lib.optionalString (configDir == "") "touch $out/lib/smb.conf";
meta = {
homepage = http://www.samba.org/;
description = "The standard Windows interoperability suite of programs for Linux and Unix";
platforms = stdenv.lib.platforms.linux;
};
} }

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

@ -6758,7 +6758,7 @@ let
cuneiform = builderDefsPackage (import ../tools/graphics/cuneiform) { cuneiform = builderDefsPackage (import ../tools/graphics/cuneiform) {
inherit cmake patchelf; inherit cmake patchelf;
imagemagick=imagemagick; imagemagick = imagemagick;
}; };
cvs = callPackage ../applications/version-management/cvs { }; cvs = callPackage ../applications/version-management/cvs { };

2
pkgs/top-level/release.nix
View File

@ -146,7 +146,6 @@ with (import ./release-lib.nix);
icewm = linux; icewm = linux;
idutils = all; idutils = all;
ifplugd = linux; ifplugd = linux;
imagemagick = allBut "i686-cygwin";
impressive = linux; impressive = linux;
inetutils = linux; inetutils = linux;
inkscape = linux; inkscape = linux;
@ -252,7 +251,6 @@ with (import ./release-lib.nix);
rubber = allBut "i686-cygwin"; rubber = allBut "i686-cygwin";
ruby = all; ruby = all;
rxvt_unicode = linux; rxvt_unicode = linux;
samba = linux;
screen = linux ++ darwin; screen = linux ++ darwin;
scrot = linux; scrot = linux;
sdparm = linux; sdparm = linux;