diff options
| author | Artturin <Artturin@artturin.com> | 2022-11-06 23:59:18 +0200 |
|---|---|---|
| committer | Artturin <Artturin@artturin.com> | 2022-11-11 04:43:46 +0200 |
| commit | 6381e4475e72bd6805d5ab87af74aba0056d12fb (patch) | |
| tree | 72b77ea86f4f0ca3959d5476e82f96078156c573 /pkgs/servers/x11 | |
| parent | 1a7742929974c6dec9b8c99d8c200953512384c0 (diff) | |
xorg: improve splicing situtation
Diffstat (limited to 'pkgs/servers/x11')
| -rw-r--r-- | pkgs/servers/x11/xorg/default.nix | 10 | ||||
| -rwxr-xr-x | pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl | 6 | ||||
| -rw-r--r-- | pkgs/servers/x11/xorg/tarballs.list | 2 |
3 files changed, 9 insertions, 9 deletions
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 2449ca6c245a2..59ec6ac715868 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1,7 +1,7 @@ # THIS IS A GENERATED FILE. DO NOT EDIT! -{ lib, newScope, pixman }: +{ lib, pixman }: -lib.makeScope newScope (self: with self; { +self: with self; { inherit pixman; @@ -1976,7 +1976,7 @@ lib.makeScope newScope (self: with self; { }) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - xdm = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXau, libXaw, libXdmcp, libXext, libXft, libXinerama, libXmu, libXpm, libxcrypt, xorgproto, libXrender, libXt }: stdenv.mkDerivation { + xdm = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXau, libXaw, libXdmcp, libXext, libXft, libXinerama, libXmu, libXpm, xorgproto, libXrender, libXt }: stdenv.mkDerivation { pname = "xdm"; version = "1.1.12"; builder = ./builder.sh; @@ -1987,7 +1987,7 @@ lib.makeScope newScope (self: with self; { hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libX11 libXau libXaw libXdmcp libXext libXft libXinerama libXmu libXpm xorgproto libXrender libXt libxcrypt ]; + buildInputs = [ libX11 libXau libXaw libXdmcp libXext libXft libXinerama libXmu libXpm xorgproto libXrender libXt ]; meta.platforms = lib.platforms.unix; }) {}; @@ -3559,4 +3559,4 @@ lib.makeScope newScope (self: with self; { meta.platforms = lib.platforms.unix; }) {}; -}) +} diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index d236eb3cbc414..d3848773cb729 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -250,9 +250,9 @@ open OUT, ">default.nix"; print OUT ""; print OUT <<EOF; # THIS IS A GENERATED FILE. DO NOT EDIT! -{ lib, newScope, pixman }: +{ lib, pixman }: -lib.makeScope newScope (self: with self; { +self: with self; { inherit pixman; @@ -336,6 +336,6 @@ foreach my $pkg (sort (keys %pkgURLs)) { EOF } -print OUT "})\n"; +print OUT "}\n"; close OUT; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index 6e11417f8f56f..3c496ec300b57 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -217,4 +217,4 @@ mirror://xorg/individual/util/lndir-1.0.3.tar.bz2 mirror://xorg/individual/util/makedepend-1.0.6.tar.bz2 mirror://xorg/individual/util/util-macros-1.19.3.tar.bz2 mirror://xorg/individual/util/xorg-cf-files-1.0.7.tar.bz2 -mirror://xorg/individual/xserver/xorg-server-1.20.13.tar.xz +mirror://xorg/individual/xserver/xorg-server-1.20.14.tar.xz |