From 91fa55e70211b4d7630e0b4ecc8bd1dee68db9d7 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 23 Sep 2014 15:48:15 +0200 Subject: [PATCH] Remove references to Nixpkgs should not use to refer to itself, because $NIX_PATH might not be set or not point to the same Nixpkgs. It's also unnecessary. --- pkgs/build-support/vm/windows/cygwin-iso/default.nix | 2 +- pkgs/games/minecraft-server/default.nix | 2 -- pkgs/tools/networking/airfield/default.nix | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/build-support/vm/windows/cygwin-iso/default.nix b/pkgs/build-support/vm/windows/cygwin-iso/default.nix index d9801428a88..b560a850a30 100644 --- a/pkgs/build-support/vm/windows/cygwin-iso/default.nix +++ b/pkgs/build-support/vm/windows/cygwin-iso/default.nix @@ -40,7 +40,7 @@ let }; in map gen expr; -in import { +in import ../../../../../nixos/lib/make-iso9660-image.nix { inherit stdenv perl cdrkit pathsFromGraph; contents = [ { source = "${cygwinCross}/bin/setup.exe"; diff --git a/pkgs/games/minecraft-server/default.nix b/pkgs/games/minecraft-server/default.nix index 12497579bdc..3bbfdedd746 100644 --- a/pkgs/games/minecraft-server/default.nix +++ b/pkgs/games/minecraft-server/default.nix @@ -1,7 +1,5 @@ { stdenv, fetchurl, jre }: -with import {}; - stdenv.mkDerivation rec { name = "minecraft-server-${version}"; version = "1.7.10"; diff --git a/pkgs/tools/networking/airfield/default.nix b/pkgs/tools/networking/airfield/default.nix index 33b0baf20a9..35dc507206d 100644 --- a/pkgs/tools/networking/airfield/default.nix +++ b/pkgs/tools/networking/airfield/default.nix @@ -3,7 +3,7 @@ with stdenv.lib; let - nodePackages = callPackage (import ) { + nodePackages = callPackage (import ../../../top-level/node-packages.nix) { neededNatives = [python] ++ optional (stdenv.isLinux) utillinux; self = nodePackages; generated = ./package.nix;