From df0d362f31ecbc5ace8d6eb97e1b99adc936061f Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 8 Oct 2013 11:05:19 +0200 Subject: [PATCH] Fix some more Hydra evaluation errors --- pkgs/applications/audio/mopidy/default.nix | 1 + pkgs/applications/graphics/jbrout/default.nix | 1 + pkgs/development/arduino/ino/default.nix | 3 ++- .../libraries/haskell/accelerate-fft/default.nix | 2 +- pkgs/development/libraries/haskell/cufft/default.nix | 2 +- pkgs/development/libraries/v8/default.nix | 2 +- pkgs/development/tools/build-managers/leiningen/default.nix | 2 +- pkgs/development/tools/casperjs/default.nix | 2 +- pkgs/servers/mpd/default.nix | 6 +++--- 9 files changed, 12 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/audio/mopidy/default.nix b/pkgs/applications/audio/mopidy/default.nix index 089751947cc4..611d9f4226dd 100644 --- a/pkgs/applications/audio/mopidy/default.nix +++ b/pkgs/applications/audio/mopidy/default.nix @@ -39,5 +39,6 @@ pythonPackages.buildPythonPackage rec { local hard drive. ''; maintainers = [ stdenv.lib.maintainers.rickynils ]; + platforms = []; }; } diff --git a/pkgs/applications/graphics/jbrout/default.nix b/pkgs/applications/graphics/jbrout/default.nix index dc397a614d3d..2207e8884f0c 100644 --- a/pkgs/applications/graphics/jbrout/default.nix +++ b/pkgs/applications/graphics/jbrout/default.nix @@ -34,5 +34,6 @@ buildPythonPackage { meta = { homepage = "http://code.google.com/p/jbrout"; description = "jBrout is a photo manager"; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/arduino/ino/default.nix b/pkgs/development/arduino/ino/default.nix index e77c2251b36d..89501f11269c 100644 --- a/pkgs/development/arduino/ino/default.nix +++ b/pkgs/development/arduino/ino/default.nix @@ -29,11 +29,12 @@ buildPythonPackage rec { --replace "self.e['avrdude']" "'${avrdude}/bin/avrdude'" \ --replace "'-C', self.e['avrdude.conf']," "" ''; - + meta = { description = "Command line toolkit for working with Arduino hardware"; homepage = http://inotool.org/; license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [ antono the-kenny ]; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/haskell/accelerate-fft/default.nix b/pkgs/development/libraries/haskell/accelerate-fft/default.nix index 523e5ae1504c..4e9a75f64eef 100644 --- a/pkgs/development/libraries/haskell/accelerate-fft/default.nix +++ b/pkgs/development/libraries/haskell/accelerate-fft/default.nix @@ -9,6 +9,6 @@ cabal.mkDerivation (self: { homepage = "https://github.com/AccelerateHS/accelerate-fft"; description = "FFT using the Accelerate library"; license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; + platforms = self.stdenv.lib.platforms.linux; }; }) diff --git a/pkgs/development/libraries/haskell/cufft/default.nix b/pkgs/development/libraries/haskell/cufft/default.nix index 76039f065488..213072b5cdfc 100644 --- a/pkgs/development/libraries/haskell/cufft/default.nix +++ b/pkgs/development/libraries/haskell/cufft/default.nix @@ -10,6 +10,6 @@ cabal.mkDerivation (self: { homepage = "http://github.com/robeverest/cufft"; description = "Haskell bindings for the CUFFT library"; license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; + platforms = self.stdenv.lib.platforms.linux; }; }) diff --git a/pkgs/development/libraries/v8/default.nix b/pkgs/development/libraries/v8/default.nix index 3fc3138ef526..5ac2487c9edc 100644 --- a/pkgs/development/libraries/v8/default.nix +++ b/pkgs/development/libraries/v8/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "V8 is Google's open source JavaScript engine"; - platforms = platforms.unix; + platforms = platforms.linux ++ platforms.darwin; license = licenses.bsd3; }; } diff --git a/pkgs/development/tools/build-managers/leiningen/default.nix b/pkgs/development/tools/build-managers/leiningen/default.nix index 779b84d0ca86..b16640105503 100644 --- a/pkgs/development/tools/build-managers/leiningen/default.nix +++ b/pkgs/development/tools/build-managers/leiningen/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { homepage = http://leiningen.org/; description = "Project automation for Clojure"; license = "EPL"; - platforms = stdenv.lib.platforms.unix; + platforms = stdenv.lib.platforms.linux; maintainer = with stdenv.lib.maintainers; [ the-kenny ]; }; } diff --git a/pkgs/development/tools/casperjs/default.nix b/pkgs/development/tools/casperjs/default.nix index 60e680a60fcd..bd63a0e68eeb 100644 --- a/pkgs/development/tools/casperjs/default.nix +++ b/pkgs/development/tools/casperjs/default.nix @@ -41,6 +41,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.bluescreen303 ]; - platforms = stdenv.lib.platforms.all; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix index 43da84dcb819..238176aadff9 100644 --- a/pkgs/servers/mpd/default.nix +++ b/pkgs/servers/mpd/default.nix @@ -34,8 +34,8 @@ in stdenv.mkDerivation rec { }; buildInputs = [ pkgconfig glib ] - ++ opt (!stdenv.isDarwin) systemd - ++ opt (!stdenv.isDarwin && alsaSupport) alsaLib + ++ opt stdenv.isLinux systemd + ++ opt (stdenv.isLinux && alsaSupport) alsaLib ++ opt flacSupport flac ++ opt vorbisSupport libvorbis # using libmad to decode mp3 files on darwin is causing a segfault -- there @@ -81,7 +81,7 @@ in stdenv.mkDerivation rec { (mkFlag mpg123Support "mpg123") (mkFlag aacSupport "aac") "--enable-debugging" ] - ++ opt (!stdenv.isDarwin) + ++ opt stdenv.isLinux "--with-systemdsystemunitdir=$(out)/etc/systemd/system"; NIX_LDFLAGS = ''