diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-09-15 12:04:41 -0700 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-09-15 12:04:41 -0700 |
| commit | 8dc707354692798b4fa365625dd92ab7f51d8673 (patch) | |
| tree | 4be7c4ec169b88723f88758984832a58082e0a7c /pkgs/servers/x11 | |
| parent | 98782144edb8c6773c1b00af70d4aa8fef912174 (diff) | |
| parent | 316a09377d12b29764b5daf51e0df8986a5fe175 (diff) | |
| download | nixlib-8dc707354692798b4fa365625dd92ab7f51d8673.tar nixlib-8dc707354692798b4fa365625dd92ab7f51d8673.tar.gz nixlib-8dc707354692798b4fa365625dd92ab7f51d8673.tar.bz2 nixlib-8dc707354692798b4fa365625dd92ab7f51d8673.tar.lz nixlib-8dc707354692798b4fa365625dd92ab7f51d8673.tar.xz nixlib-8dc707354692798b4fa365625dd92ab7f51d8673.tar.zst nixlib-8dc707354692798b4fa365625dd92ab7f51d8673.zip | |
Merge branch 'master.upstream' into staging.upstream
Diffstat (limited to 'pkgs/servers/x11')
| -rw-r--r-- | pkgs/servers/x11/xorg/default.nix | 5 | ||||
| -rwxr-xr-x | pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index b9bc2838f8f7..778fe03a0c28 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1,5 +1,8 @@ # THIS IS A GENERATED FILE. DO NOT EDIT! -args: with args; +args @ { clangStdenv, fetchurl, fetchgit, fetchpatch, stdenv, pkgconfig, intltool, freetype, fontconfig +, libxslt, expat, libpng, zlib, perl, mesa_drivers, spice_protocol +, dbus, libuuid, openssl, gperf, m4, libevdev, tradcpp, libinput, mcpp, makeWrapper, autoreconfHook +, autoconf, automake, libtool, xmlto, asciidoc, flex, bison, python, mtdev, pixman, ... }: with args; let diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index 7b2c20e05eb6..1e0ce6d6167e 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -229,7 +229,10 @@ open OUT, ">default.nix"; print OUT ""; print OUT <<EOF; # THIS IS A GENERATED FILE. DO NOT EDIT! -args: with args; +args @ { clangStdenv, fetchurl, fetchgit, fetchpatch, stdenv, pkgconfig, intltool, freetype, fontconfig +, libxslt, expat, libpng, zlib, perl, mesa_drivers, spice_protocol +, dbus, libuuid, openssl, gperf, m4, libevdev, tradcpp, libinput, mcpp, makeWrapper, autoreconfHook +, autoconf, automake, libtool, xmlto, asciidoc, flex, bison, python, mtdev, pixman, ... }: with args; let |