diff options
| author | Franz Pletz <fpletz@fnordicwalking.de> | 2016-05-18 17:10:02 +0200 |
|---|---|---|
| committer | Franz Pletz <fpletz@fnordicwalking.de> | 2016-05-18 17:10:02 +0200 |
| commit | f8d481754cf842ca6e6ac1427ce0f571f5a44108 (patch) | |
| tree | 70e702285987429aed275e0d5e2dc15c050e1f8c /pkgs/servers/x11 | |
| parent | 9fbc20e2f89bc045efac7ade41949a2c2d571dec (diff) | |
| parent | 3cd63ade1614d4c581735ffb0cebe181bf87dfc8 (diff) | |
| download | nixlib-f8d481754cf842ca6e6ac1427ce0f571f5a44108.tar nixlib-f8d481754cf842ca6e6ac1427ce0f571f5a44108.tar.gz nixlib-f8d481754cf842ca6e6ac1427ce0f571f5a44108.tar.bz2 nixlib-f8d481754cf842ca6e6ac1427ce0f571f5a44108.tar.lz nixlib-f8d481754cf842ca6e6ac1427ce0f571f5a44108.tar.xz nixlib-f8d481754cf842ca6e6ac1427ce0f571f5a44108.tar.zst nixlib-f8d481754cf842ca6e6ac1427ce0f571f5a44108.zip | |
Merge remote-tracking branch 'origin/master' into hardened-stdenv
Diffstat (limited to 'pkgs/servers/x11')
| -rw-r--r-- | pkgs/servers/x11/xorg/default.nix | 11 | ||||
| -rw-r--r-- | pkgs/servers/x11/xorg/extra.list | 1 | ||||
| -rw-r--r-- | pkgs/servers/x11/xorg/overrides.nix | 1 | ||||
| -rw-r--r-- | pkgs/servers/x11/xquartz/default.nix | 7 |
4 files changed, 19 insertions, 1 deletions
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 7ba97cf35b04..45c01d74cdb3 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -28,6 +28,17 @@ let meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; + appres = (mkDerivation "appres" { + name = "appres-1.0.4"; + builder = ./builder.sh; + src = fetchurl { + url = mirror://xorg/individual/app/appres-1.0.4.tar.bz2; + sha256 = "139yp08qy1w6dccamdy0fh343yhaf1am1v81m2j435nd4ya4wqcz"; + }; + buildInputs = [pkgconfig libX11 xproto libXt ]; + meta.platforms = stdenv.lib.platforms.unix; + }) // {inherit libX11 xproto libXt ;}; + bdftopcf = (mkDerivation "bdftopcf" { name = "bdftopcf-1.0.5"; builder = ./builder.sh; diff --git a/pkgs/servers/x11/xorg/extra.list b/pkgs/servers/x11/xorg/extra.list index 80b5e14d8c3b..fc3068b8f357 100644 --- a/pkgs/servers/x11/xorg/extra.list +++ b/pkgs/servers/x11/xorg/extra.list @@ -8,3 +8,4 @@ http://xcb.freedesktop.org/dist/xcb-util-keysyms-0.4.0.tar.bz2 http://xcb.freedesktop.org/dist/xcb-util-renderutil-0.3.9.tar.bz2 http://xcb.freedesktop.org/dist/xcb-util-wm-0.4.1.tar.bz2 http://xcb.freedesktop.org/dist/xcb-util-errors-1.0.tar.bz2 +mirror://xorg/individual/app/appres-1.0.4.tar.bz2 diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 2743551474d8..6c0bb80b755f 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -265,6 +265,7 @@ in }; xcbutilcursor = attrs: attrs // { + outputs = [ "dev" "out" ]; meta.maintainers = [ stdenv.lib.maintainers.lovek323 ]; }; diff --git a/pkgs/servers/x11/xquartz/default.nix b/pkgs/servers/x11/xquartz/default.nix index db0c446617af..16a4aeb1ce58 100644 --- a/pkgs/servers/x11/xquartz/default.nix +++ b/pkgs/servers/x11/xquartz/default.nix @@ -98,9 +98,13 @@ let }; in stdenv.mkDerivation { name = "xquartz"; + buildInputs = [ ruby makeWrapper ]; + unpackPhase = "sourceRoot=."; - buildPhase = ":"; + + dontBuild = true; + installPhase = '' cp -rT ${xorg.xinit} $out chmod -R u+w $out @@ -179,6 +183,7 @@ in stdenv.mkDerivation { --replace "@DEFAULT_CLIENT@" "${xterm}/bin/xterm" \ --replace "@FONTCONFIG_FILE@" "$fontsConfPath" ''; + meta = with lib; { platforms = platforms.darwin; maintainers = with maintainers; [ cstrahan ]; |