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

Use meta.platforms

Browse Source 
svn path=/nixpkgs/trunk/; revision=31909
This commit is contained in:
Yury G. Kudryashov 2012-01-28 14:39:56 +00:00
parent 12e953b944
commit 71c28d0e33
7 changed files with 13 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkgs/applications/video/MPlayer/default.nix
View File

@ -166,5 +166,6 @@ stdenv.mkDerivation rec {
homepage = "http://mplayerhq.hu";
license = "GPL";
maintainers = [ stdenv.lib.maintainers.eelco stdenv.lib.maintainers.urkud ];
platforms = stdenv.lib.platforms.linux;
};
}

1
pkgs/development/libraries/aspell/dictionaries.nix
View File

@ -22,6 +22,7 @@ let
meta = {
description = "Aspell dictionary for ${fullName}";
platforms = stdenv.lib.platforms.all;
};
};

2
pkgs/development/tools/build-managers/cmake/default.nix
View File

@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
meta = {
homepage = http://www.cmake.org/;
description = "Cross-Platform Makefile Generator";
platforms = if useQt4 then qt4.meta.platforms else stdenv.lib.platforms.unix;
platforms = if useQt4 then qt4.meta.platforms else stdenv.lib.platforms.all;
maintainers = [ stdenv.lib.maintainers.urkud ];
};
}

1
pkgs/development/tools/misc/pkgconfig/default.nix
View File

@ -19,6 +19,7 @@ stdenv.mkDerivation (rec {
meta = {
description = "A tool that allows packages to find out information about other packages";
homepage = http://pkg-config.freedesktop.org/wiki/;
platforms = stdenv.lib.platforms.all;
};
} // (if stdenv.system == "mips64el-linux" then

5
pkgs/os-specific/linux/wpa_supplicant/default.nix
View File

@ -89,5 +89,10 @@ gui = stdenv.mkDerivation {
mkdir -pv $out/share/icons
cp -av icons/hicolor $out/share/icons
'';
meta = {
description = "Qt4 wpa_supplicant client";
inherit (qt4.meta) platforms;
};
};
}

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

@ -3688,11 +3688,11 @@ let
gtkmathview = callPackage ../development/libraries/gtkmathview { };
gtkLibs = pkgs.gtkLibs224;
gtkLibs = recurseIntoAttrs pkgs.gtkLibs224;
inherit (pkgs.gtkLibs) glib gtk pango cairo gdk_pixbuf;
gtkLibs224 = recurseIntoAttrs (let callPackage = pkgs.newScope pkgs.gtkLibs224; in {
gtkLibs224 = let callPackage = pkgs.newScope pkgs.gtkLibs224; in {
glib = callPackage ../development/libraries/glib/2.28.x.nix { };
@ -3716,7 +3716,7 @@ let
gob2 = callPackage ../development/tools/misc/gob2 { };
});
};
gtkLibs3x = let callPackage = newScope pkgs.gtkLibs3x; in {
glib = callPackage ../development/libraries/glib/2.30.x.nix { };
@ -6264,8 +6264,7 @@ let
wirelesstools = callPackage ../os-specific/linux/wireless-tools { };
wpa_supplicant = callPackage ../os-specific/linux/wpa_supplicant {
};
wpa_supplicant = callPackage ../os-specific/linux/wpa_supplicant { };
wpa_supplicant_gui = pkgs.wpa_supplicant.gui;

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

@ -15,7 +15,6 @@ with (import ./release-lib.nix);
} // (mapTestOn ((packagesWithMetaPlatform pkgs) // rec {
MPlayer = linux;
abcde = linux;
alsaUtils = linux;
apacheHttpd = linux;
@ -52,12 +51,10 @@ with (import ./release-lib.nix);
chatzilla = linux;
cksfv = all;
classpath = linux;
cmake = all;
consolekit = linux;
coreutils = all;
cpio = all;
cron = linux;
cups = linux;
cvs = linux;
db4 = all;
ddrescue = linux;
@ -237,7 +234,6 @@ with (import ./release-lib.nix);
php = linux;
pidgin = linux;
pinentry = linux;
pkgconfig = all;
pltScheme = linux;
pmccabe = linux;
portmap = linux;
@ -333,7 +329,6 @@ with (import ./release-lib.nix);
wine = ["i686-linux"];
wireshark = linux;
wirelesstools = linux;
wpa_supplicant = linux;
wxGTK = linux;
x11_ssh_askpass = linux;
xchm = linux;
@ -354,20 +349,6 @@ with (import ./release-lib.nix);
zsh = linux;
zsnes = ["i686-linux"];
aspellDicts = {
de = all;
en = all;
es = all;
fr = all;
nl = all;
ru = all;
};
dbus_all = {
libs = linux;
tools = linux;
};
emacs22Packages = {
bbdb = linux;
cedet = linux;
@ -391,10 +372,6 @@ with (import ./release-lib.nix);
gnome_vfs = linux;
};
gtkLibs = {
gtk = linux;
};
/*
haskellPackages_ghc6104 = {
ghc = ghcSupported;