diff options
Diffstat (limited to 'pkgs/servers')
| -rw-r--r-- | pkgs/servers/sql/postgresql/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/servers/x11/xorg/default.nix | 16 | ||||
| -rwxr-xr-x | pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl | 24 | ||||
| -rw-r--r-- | pkgs/servers/x11/xorg/overrides.nix | 12 | ||||
| -rw-r--r-- | pkgs/servers/x11/xorg/tarballs-7.7.list | 2 |
5 files changed, 38 insertions, 19 deletions
diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index f802de9df9df..6100cb2d1d1f 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -70,7 +70,8 @@ let # Remove static libraries in case dynamic are available. for i in $out/lib/*.a; do name="$(basename "$i")" - if [ -e "$lib/lib/''${name%.a}.so" ] || [ -e "''${i%.a}.so" ]; then + ext="${stdenv.hostPlatform.extensions.sharedLibrary}" + if [ -e "$lib/lib/''${name%.a}$ext" ] || [ -e "''${i%.a}$ext" ]; then rm "$i" fi done diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index b53a5a235333..1f953e89ec88 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -820,11 +820,11 @@ lib.makeScope newScope (self: with self; { }) {}; libX11 = callPackage ({ stdenv, pkgconfig, fetchurl, inputproto, kbproto, libxcb, xextproto, xf86bigfontproto, xproto, xtrans }: stdenv.mkDerivation { - name = "libX11-1.6.6"; + name = "libX11-1.6.7"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libX11-1.6.6.tar.bz2; - sha256 = "0ks1mxlda7nxfmffihi15ljsn50q8dknl33i2xag8xzc80fiizk5"; + url = mirror://xorg/individual/lib/libX11-1.6.7.tar.bz2; + sha256 = "0j0k5bjz4kd7rx6z09n5ggxbzbi84wf78xx25ikx6jmsxwq9w3li"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; @@ -1248,7 +1248,7 @@ lib.makeScope newScope (self: with self; { meta.platforms = stdenv.lib.platforms.unix; }) {}; - libxcb = callPackage ({ stdenv, pkgconfig, fetchurl, libxslt, libpthreadstubs, python, libXau, xcbproto, libXdmcp }: stdenv.mkDerivation { + libxcb = callPackage ({ stdenv, pkgconfig, fetchurl, libxslt, libpthreadstubs, libXau, xcbproto, libXdmcp, python }: stdenv.mkDerivation { name = "libxcb-1.13.1"; builder = ./builder.sh; src = fetchurl { @@ -1256,8 +1256,8 @@ lib.makeScope newScope (self: with self; { sha256 = "1i27lvrcsygims1pddpl5c4qqs6z715lm12ax0n3vx0igapvg7x8"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libxslt libpthreadstubs python libXau xcbproto libXdmcp ]; + nativeBuildInputs = [ pkgconfig python ]; + buildInputs = [ libxslt libpthreadstubs libXau xcbproto libXdmcp ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; @@ -1594,8 +1594,8 @@ lib.makeScope newScope (self: with self; { sha256 = "1qdxw9syhbvswiqj5dvj278lrmfhs81apzmvx6205s4vcqg7563v"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ python ]; + nativeBuildInputs = [ pkgconfig python ]; + buildInputs = [ ]; meta.platforms = stdenv.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 701a8984ada1..aba45a215349 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -23,6 +23,7 @@ my %pkgURLs; my %pkgHashes; my %pkgNames; my %pkgRequires; +my %pkgNativeRequires; my %pcMap; @@ -106,6 +107,7 @@ while (<>) { my $provides = `find $pkgDir -name "*.pc.in"`; my @provides2 = split '\n', $provides; my @requires = (); + my @nativeRequires = (); foreach my $pcFile (@provides2) { my $pc = $pcFile; @@ -163,7 +165,7 @@ while (<>) { } if ($file =~ /AM_PATH_PYTHON/) { - push @requires, "python"; + push @nativeRequires, "python"; } if ($file =~ /AC_PATH_PROG\(FCCACHE/) { @@ -230,7 +232,9 @@ while (<>) { push @requires, "gperf", "m4", "xproto" if $pkg =~ /xcbutil/; print "REQUIRES $pkg => @requires\n"; + print "NATIVE_REQUIRES $pkg => @nativeRequires\n"; $pkgRequires{$pkg} = \@requires; + $pkgNativeRequires{$pkg} = \@nativeRequires; print "done\n"; } @@ -255,6 +259,20 @@ EOF foreach my $pkg (sort (keys %pkgURLs)) { print "$pkg\n"; + my %nativeRequires = (); + my @nativeBuildInputs; + foreach my $req (sort @{$pkgNativeRequires{$pkg}}) { + if (defined $pcMap{$req}) { + # Some packages have .pc that depends on itself. + next if $pcMap{$req} eq $pkg; + if (!defined $nativeRequires{$pcMap{$req}}) { + push @nativeBuildInputs, $pcMap{$req}; + $nativeRequires{$pcMap{$req}} = 1; + } + } else { + print " NOT FOUND: $req\n"; + } + } my %requires = (); my @buildInputs; foreach my $req (sort @{$pkgRequires{$pkg}}) { @@ -270,9 +288,11 @@ foreach my $pkg (sort (keys %pkgURLs)) { } } + my $nativeBuildInputsStr = join "", map { $_ . " " } @nativeBuildInputs; my $buildInputsStr = join "", map { $_ . " " } @buildInputs; my @arguments = @buildInputs; + push @arguments, @nativeBuildInputs; unshift @arguments, "stdenv", "pkgconfig", "fetchurl"; my $argumentsStr = join ", ", @arguments; @@ -290,7 +310,7 @@ foreach my $pkg (sort (keys %pkgURLs)) { sha256 = "$pkgHashes{$pkg}"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig $nativeBuildInputsStr]; buildInputs = [ $buildInputsStr];$extraAttrsStr meta.platforms = stdenv.lib.platforms.unix; }) {}; diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 48e67ac74a80..8c3917171ecc 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -1,8 +1,8 @@ { abiCompat ? null, - stdenv, makeWrapper, lib, fetchurl, fetchpatch, + stdenv, makeWrapper, lib, fetchurl, fetchpatch, buildPackages, automake, autoconf, libtool, intltool, mtdev, libevdev, libinput, - python, freetype, tradcpp, fontconfig, + freetype, tradcpp, fontconfig, libGL, spice-protocol, zlib, libGLU, dbus, libunwind, libdrm, mesa_noglu, udev, bootstrap_cmds, bison, flex, clangStdenv, autoreconfHook, mcpp, epoxy, openssl, pkgconfig, llvm_6, @@ -85,19 +85,15 @@ self: super: }); libxcb = super.libxcb.overrideAttrs (attrs: { - nativeBuildInputs = attrs.nativeBuildInputs ++ [ python ]; configureFlags = [ "--enable-xkb" "--enable-xinput" ]; outputs = [ "out" "dev" "man" "doc" ]; }); - xcbproto = super.xcbproto.overrideAttrs (attrs: { - nativeBuildInputs = attrs.nativeBuildInputs ++ [ python ]; - }); - libX11 = super.libX11.overrideAttrs (attrs: { outputs = [ "out" "dev" "man" ]; configureFlags = attrs.configureFlags or [] ++ malloc0ReturnsNullCrossFlag; + depsBuildBuild = [ buildPackages.stdenv.cc ]; preConfigure = '' sed 's,^as_dummy.*,as_dummy="\$PATH",' -i configure ''; @@ -249,6 +245,8 @@ self: super: libXv = super.libXv.overrideAttrs (attrs: { outputs = [ "out" "dev" "devdoc" ]; + configureFlags = attrs.configureFlags or [] + ++ malloc0ReturnsNullCrossFlag; }); libXvMC = super.libXvMC.overrideAttrs (attrs: { diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list index 1775d697d810..30b553b93db1 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.7.list +++ b/pkgs/servers/x11/xorg/tarballs-7.7.list @@ -60,7 +60,7 @@ mirror://xorg/individual/lib/libICE-1.0.9.tar.bz2 mirror://xorg/individual/lib/libpciaccess-0.14.tar.bz2 mirror://xorg/individual/lib/libSM-1.2.2.tar.bz2 mirror://xorg/X11R7.7/src/everything/libWindowsWM-1.0.1.tar.bz2 -mirror://xorg/individual/lib/libX11-1.6.6.tar.bz2 +mirror://xorg/individual/lib/libX11-1.6.7.tar.bz2 mirror://xorg/individual/lib/libXau-1.0.8.tar.bz2 mirror://xorg/individual/lib/libXaw-1.0.13.tar.bz2 mirror://xorg/individual/lib/libXcomposite-0.4.4.tar.bz2 |