summary refs log tree commit diff
path: root/pkgs/servers/x11
diff options
context:
space:
mode:
authorMathnerd314 <mathnerd314.gph+hs@gmail.com>2015-09-14 22:27:19 -0600
committerMathnerd314 <mathnerd314.gph+hs@gmail.com>2015-09-14 22:27:19 -0600
commiteb7404d97a7e46df1f598a74982ca06e08033a45 (patch)
tree6b5752df7032ba1efc535cf884db4891f20dd786 /pkgs/servers/x11
parent7fb1c7efcfa34a4af9f5de5fbde9e12d15017a90 (diff)
downloadnixpkgs-eb7404d97a7e46df1f598a74982ca06e08033a45.tar
nixpkgs-eb7404d97a7e46df1f598a74982ca06e08033a45.tar.gz
nixpkgs-eb7404d97a7e46df1f598a74982ca06e08033a45.tar.bz2
nixpkgs-eb7404d97a7e46df1f598a74982ca06e08033a45.tar.lz
nixpkgs-eb7404d97a7e46df1f598a74982ca06e08033a45.tar.xz
nixpkgs-eb7404d97a7e46df1f598a74982ca06e08033a45.tar.zst
nixpkgs-eb7404d97a7e46df1f598a74982ca06e08033a45.zip
all-packages: Use callPackage where possible
Diffstat (limited to 'pkgs/servers/x11')
-rw-r--r--pkgs/servers/x11/xorg/default.nix5
-rwxr-xr-xpkgs/servers/x11/xorg/generate-expr-from-tarballs.pl5
2 files changed, 8 insertions, 2 deletions
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index f9ea1fb4a29..eed219cd5ad 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 7b2c20e05eb..1e0ce6d6167 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