From a17216af4c82dbeb33030355664d96875558f7ac Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Mon, 29 Aug 2016 03:30:01 +0300 Subject: treewide: Shuffle outputs Make either 'bin' or 'out' the first output. --- pkgs/desktops/gnome-2/platform/GConf/default.nix | 2 +- pkgs/desktops/gnome-2/platform/ORBit2/default.nix | 2 +- pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix | 2 +- pkgs/desktops/gnome-2/platform/libbonobo/default.nix | 2 +- pkgs/desktops/gnome-2/platform/libglade/default.nix | 2 +- pkgs/desktops/gnome-2/platform/libgnome/default.nix | 2 +- pkgs/desktops/gnome-2/platform/libgnomecanvas/default.nix | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) (limited to 'pkgs/desktops/gnome-2') diff --git a/pkgs/desktops/gnome-2/platform/GConf/default.nix b/pkgs/desktops/gnome-2/platform/GConf/default.nix index 30f92e4e054e..b848296d5f0f 100644 --- a/pkgs/desktops/gnome-2/platform/GConf/default.nix +++ b/pkgs/desktops/gnome-2/platform/GConf/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "09ch709cb9fniwc4221xgkq0jf0x0lxs814sqig8p2dcll0llvzk"; }; - outputs = [ "dev" "out" "doc" ]; + outputs = [ "out" "dev" "doc" ]; buildInputs = [ ORBit2 dbus_libs dbus_glib libxml2 ] # polkit requires pam, which requires shadow.h, which is not available on diff --git a/pkgs/desktops/gnome-2/platform/ORBit2/default.nix b/pkgs/desktops/gnome-2/platform/ORBit2/default.nix index 27233f4993cd..b8a41a529b05 100644 --- a/pkgs/desktops/gnome-2/platform/ORBit2/default.nix +++ b/pkgs/desktops/gnome-2/platform/ORBit2/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ glib libIDL ] ++ libintlOrEmpty; - outputs = [ "dev" "out" ]; + outputs = [ "out" "dev" ]; preBuild = '' sed 's/-DG_DISABLE_DEPRECATED//' -i linc2/src/Makefile diff --git a/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix b/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix index 340c14e914f6..76c2f8c0d409 100644 --- a/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix +++ b/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1ajg8jb8k3snxc7rrgczlh8daxkjidmcv3zr9w809sq4p2sn9pk2"; }; - outputs = [ "dev" "out" ]; + outputs = [ "out" "dev" ]; buildInputs = [ pkgconfig libxml2 bzip2 openssl samba dbus_glib fam cdparanoia diff --git a/pkgs/desktops/gnome-2/platform/libbonobo/default.nix b/pkgs/desktops/gnome-2/platform/libbonobo/default.nix index af1960af36ac..d93ef73ca986 100644 --- a/pkgs/desktops/gnome-2/platform/libbonobo/default.nix +++ b/pkgs/desktops/gnome-2/platform/libbonobo/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "0swp4kk6x7hy1rvd1f9jba31lvfc6qvafkvbpg9h0r34fzrd8q4i"; }; - outputs = [ "dev" "out" ]; + outputs = [ "out" "dev" ]; preConfigure = # still using stuff deprecated in new glib versions "sed 's/-DG_DISABLE_DEPRECATED//g' -i configure activation-server/Makefile.in"; diff --git a/pkgs/desktops/gnome-2/platform/libglade/default.nix b/pkgs/desktops/gnome-2/platform/libglade/default.nix index ce1da95762ff..a20c419fe0fb 100644 --- a/pkgs/desktops/gnome-2/platform/libglade/default.nix +++ b/pkgs/desktops/gnome-2/platform/libglade/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "1v2x2s04jry4gpabws92i0wq2ghd47yr5n9nhgnkd7c38xv1wdk4"; }; - outputs = [ "dev" "out" ]; + outputs = [ "out" "dev" ]; buildInputs = [ pkgconfig gtk python gettext ]; diff --git a/pkgs/desktops/gnome-2/platform/libgnome/default.nix b/pkgs/desktops/gnome-2/platform/libgnome/default.nix index d0a4d1787c6c..1bffa6211dca 100644 --- a/pkgs/desktops/gnome-2/platform/libgnome/default.nix +++ b/pkgs/desktops/gnome-2/platform/libgnome/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "197pnq8y0knqjhm2fg4j6hbqqm3qfzfnd0irhwxpk1b4hqb3kimj"; }; - outputs = [ "dev" "out" ]; + outputs = [ "out" "dev" ]; patches = [ ./new-glib.patch ]; diff --git a/pkgs/desktops/gnome-2/platform/libgnomecanvas/default.nix b/pkgs/desktops/gnome-2/platform/libgnomecanvas/default.nix index 5b5e7af5431a..2be8c29e4931 100644 --- a/pkgs/desktops/gnome-2/platform/libgnomecanvas/default.nix +++ b/pkgs/desktops/gnome-2/platform/libgnomecanvas/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0h6xvswbqspdifnyh5pm2pqq55yp3kn6yrswq7ay9z49hkh7i6w5"; }; - outputs = [ "dev" "out" ]; + outputs = [ "out" "dev" ]; buildInputs = [ libglade ]; nativeBuildInputs = [ pkgconfig intltool ]; -- cgit 1.4.1