Remove references to <nixpkgs>
Nixpkgs should not use <nixpkgs> to refer to itself, because $NIX_PATH might not be set or not point to the same Nixpkgs. It's also unnecessary.
This commit is contained in:
parent
eb3794186c
commit
91fa55e702
|
@ -40,7 +40,7 @@ let
|
||||||
};
|
};
|
||||||
in map gen expr;
|
in map gen expr;
|
||||||
|
|
||||||
in import <nixpkgs/nixos/lib/make-iso9660-image.nix> {
|
in import ../../../../../nixos/lib/make-iso9660-image.nix {
|
||||||
inherit stdenv perl cdrkit pathsFromGraph;
|
inherit stdenv perl cdrkit pathsFromGraph;
|
||||||
contents = [
|
contents = [
|
||||||
{ source = "${cygwinCross}/bin/setup.exe";
|
{ source = "${cygwinCross}/bin/setup.exe";
|
||||||
|
|
|
@ -1,7 +1,5 @@
|
||||||
{ stdenv, fetchurl, jre }:
|
{ stdenv, fetchurl, jre }:
|
||||||
|
|
||||||
with import <nixpkgs> {};
|
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "minecraft-server-${version}";
|
name = "minecraft-server-${version}";
|
||||||
version = "1.7.10";
|
version = "1.7.10";
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
with stdenv.lib;
|
with stdenv.lib;
|
||||||
|
|
||||||
let
|
let
|
||||||
nodePackages = callPackage (import <nixpkgs/pkgs/top-level/node-packages.nix>) {
|
nodePackages = callPackage (import ../../../top-level/node-packages.nix) {
|
||||||
neededNatives = [python] ++ optional (stdenv.isLinux) utillinux;
|
neededNatives = [python] ++ optional (stdenv.isLinux) utillinux;
|
||||||
self = nodePackages;
|
self = nodePackages;
|
||||||
generated = ./package.nix;
|
generated = ./package.nix;
|
||||||
|
|
Loading…
Reference in New Issue