From 71c28d0e336ea3d5582d1e889b1adca4db00ab54 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sat, 28 Jan 2012 14:39:56 +0000 Subject: [PATCH] Use meta.platforms svn path=/nixpkgs/trunk/; revision=31909 --- pkgs/applications/video/MPlayer/default.nix | 1 + .../libraries/aspell/dictionaries.nix | 1 + .../tools/build-managers/cmake/default.nix | 2 +- .../tools/misc/pkgconfig/default.nix | 1 + .../linux/wpa_supplicant/default.nix | 5 ++++ pkgs/top-level/all-packages.nix | 9 ++++---- pkgs/top-level/release.nix | 23 ------------------- 7 files changed, 13 insertions(+), 29 deletions(-) diff --git a/pkgs/applications/video/MPlayer/default.nix b/pkgs/applications/video/MPlayer/default.nix index 0566b4bbe29..a594bd4e2c6 100644 --- a/pkgs/applications/video/MPlayer/default.nix +++ b/pkgs/applications/video/MPlayer/default.nix @@ -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; }; } diff --git a/pkgs/development/libraries/aspell/dictionaries.nix b/pkgs/development/libraries/aspell/dictionaries.nix index 3bd1d82e0b5..90a9469ee54 100644 --- a/pkgs/development/libraries/aspell/dictionaries.nix +++ b/pkgs/development/libraries/aspell/dictionaries.nix @@ -22,6 +22,7 @@ let meta = { description = "Aspell dictionary for ${fullName}"; + platforms = stdenv.lib.platforms.all; }; }; diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index 80958e2885f..a3a10525c08 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -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 ]; }; } diff --git a/pkgs/development/tools/misc/pkgconfig/default.nix b/pkgs/development/tools/misc/pkgconfig/default.nix index ae5048f6306..f323a7d7dbc 100644 --- a/pkgs/development/tools/misc/pkgconfig/default.nix +++ b/pkgs/development/tools/misc/pkgconfig/default.nix @@ -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 diff --git a/pkgs/os-specific/linux/wpa_supplicant/default.nix b/pkgs/os-specific/linux/wpa_supplicant/default.nix index 8d216f7899d..6ffc2c5a059 100644 --- a/pkgs/os-specific/linux/wpa_supplicant/default.nix +++ b/pkgs/os-specific/linux/wpa_supplicant/default.nix @@ -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; + }; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8249ab6d732..671a9fb3336 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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; diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index e1976b5d732..08f6e993b11 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -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;