diff options
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/appimage/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/build-support/docker/default.nix | 18 | ||||
| -rw-r--r-- | pkgs/build-support/fetchurl/mirrors.nix | 7 |
3 files changed, 19 insertions, 11 deletions
diff --git a/pkgs/build-support/appimage/default.nix b/pkgs/build-support/appimage/default.nix index c17274295c96..de0e05f8da74 100644 --- a/pkgs/build-support/appimage/default.nix +++ b/pkgs/build-support/appimage/default.nix @@ -133,6 +133,11 @@ rec { xorg.libXt xorg.libXmu xorg.libxcb + xorg.xcbutil + xorg.xcbutilwm + xorg.xcbutilimage + xorg.xcbutilkeysyms + xorg.xcbutilrenderutil libGLU libuuid libogg diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index 57e40069003a..ae000c2daefc 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -75,7 +75,7 @@ rec { # We need to sum layer.tar, not a directory, hence tarsum instead of nix-hash. # And we cannot untar it, because then we cannot preserve permissions ecc. tarsum = runCommand "tarsum" { - buildInputs = [ go ]; + nativeBuildInputs = [ go ]; } '' mkdir tarsum cd tarsum @@ -165,7 +165,7 @@ rec { }; inherit fromImage fromImageName fromImageTag; - buildInputs = [ utillinux e2fsprogs jshon rsync jq ]; + nativeBuildInputs = [ utillinux e2fsprogs jshon rsync jq ]; } '' rm -rf $out @@ -297,7 +297,7 @@ rec { runCommand "${name}-granular-docker-layers" { inherit maxLayers; paths = referencesByPopularity closure; - buildInputs = [ jshon rsync tarsum ]; + nativeBuildInputs = [ jshon rsync tarsum ]; enableParallelBuilding = true; } '' @@ -335,7 +335,7 @@ rec { uid ? 0, gid ? 0, }: runCommand "${name}-customisation-layer" { - buildInputs = [ jshon rsync tarsum ]; + nativeBuildInputs = [ jshon rsync tarsum ]; inherit extraCommands; } '' @@ -380,7 +380,7 @@ rec { }: runCommand "docker-layer-${name}" { inherit baseJson contents extraCommands; - buildInputs = [ jshon rsync tarsum ]; + nativeBuildInputs = [ jshon rsync tarsum ]; } '' mkdir layer @@ -535,7 +535,7 @@ rec { os = "linux"; }); impure = runCommand "${baseName}-standard-dynamic-date.json" - { buildInputs = [ jq ]; } + { nativeBuildInputs = [ jq ]; } '' jq ".created = \"$(TZ=utc date --iso-8601="seconds")\"" ${pure} > $out ''; @@ -556,7 +556,7 @@ rec { inherit uid gid extraCommands; }; result = runCommand "docker-image-${baseName}.tar.gz" { - buildInputs = [ jshon pigz coreutils findutils jq ]; + nativeBuildInputs = [ jshon pigz coreutils findutils jq ]; # Image name and tag must be lowercase imageName = lib.toLower name; baseJson = configJson; @@ -653,7 +653,7 @@ rec { os = "linux"; }); impure = runCommand "${baseName}-config.json" - { buildInputs = [ jq ]; } + { nativeBuildInputs = [ jq ]; } '' jq ".created = \"$(TZ=utc date --iso-8601="seconds")\"" ${pure} > $out ''; @@ -671,7 +671,7 @@ rec { extraCommands; }; result = runCommand "docker-image-${baseName}.tar.gz" { - buildInputs = [ jshon pigz coreutils findutils jq ]; + nativeBuildInputs = [ jshon pigz coreutils findutils jq ]; # Image name and tag must be lowercase imageName = lib.toLower name; imageTag = if tag == null then "" else lib.toLower tag; diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix index 404cea7532bf..d9e44afb68df 100644 --- a/pkgs/build-support/fetchurl/mirrors.nix +++ b/pkgs/build-support/fetchurl/mirrors.nix @@ -19,8 +19,11 @@ rec { https://kent.dl.sourceforge.net/sourceforge/ ]; - # SourceForge.jp. - sourceforgejp = [ + # OSDN (formerly SourceForge.jp). + osdn = [ + https://osdn.dl.osdn.jp/ + https://osdn.mirror.constant.com/ + https://mirrors.gigenet.com/OSDN/ https://osdn.dl.sourceforge.jp/ https://jaist.dl.sourceforge.jp/ ]; |