about summary refs log tree commit diff
diff options
context:
space:
mode:
authorLengyel Balazs <ikervagyok@gmail.com>2019-02-21 20:12:04 +0100
committerUli Baum <xeji@cat3.de>2019-02-24 12:39:26 +0100
commitdffba878e135960d14f12392a52eb24194539dd7 (patch)
tree2b4834a1ba86188c3b013230c2cf21fa7c030893
parented508238beb1ce451cc02d9322dad6cdaf65f848 (diff)
downloadnixlib-dffba878e135960d14f12392a52eb24194539dd7.tar
nixlib-dffba878e135960d14f12392a52eb24194539dd7.tar.gz
nixlib-dffba878e135960d14f12392a52eb24194539dd7.tar.bz2
nixlib-dffba878e135960d14f12392a52eb24194539dd7.tar.lz
nixlib-dffba878e135960d14f12392a52eb24194539dd7.tar.xz
nixlib-dffba878e135960d14f12392a52eb24194539dd7.tar.zst
nixlib-dffba878e135960d14f12392a52eb24194539dd7.zip
xorg/xstdcmap: init at 1.0.4
(cherry picked from commit 6a316df98800e41954fd820e87da8752d5fc48cb)
-rw-r--r--pkgs/servers/x11/xorg/default.nix13
-rw-r--r--pkgs/servers/x11/xorg/tarballs.list1
2 files changed, 14 insertions, 0 deletions
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 0586f30d9ce3..1e7e0f0bb6ee 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -2795,6 +2795,19 @@ lib.makeScope newScope (self: with self; {
     meta.platforms = stdenv.lib.platforms.unix;
   }) {};
 
+  xstdcmap = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXmu, xorgproto }: stdenv.mkDerivation {
+    name = "xstdcmap-1.0.4";
+    builder = ./builder.sh;
+    src = fetchurl {
+      url = mirror://xorg/individual/app/xstdcmap-1.0.4.tar.bz2;
+      sha256 = "12vgzsxv4rw25frkgjyli6w6hy10lgpvsx9wzw2v5l5a3qzqp286";
+    };
+    hardeningDisable = [ "bindnow" "relro" ];
+    nativeBuildInputs = [ pkgconfig ];
+    buildInputs = [ libX11 libXmu xorgproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
+  }) {};
+
   xtrans = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation {
     name = "xtrans-1.3.5";
     builder = ./builder.sh;
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index 82ead0244174..6a4e9c650c90 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -68,6 +68,7 @@ mirror://xorg/individual/app/xrefresh-1.0.6.tar.bz2
 mirror://xorg/individual/app/xset-1.2.4.tar.bz2
 mirror://xorg/individual/app/xsetroot-1.1.2.tar.bz2
 mirror://xorg/individual/app/xsm-1.0.4.tar.bz2
+mirror://xorg/individual/app/xstdcmap-1.0.4.tar.bz2
 mirror://xorg/individual/app/xtrap-1.0.3.tar.bz2
 mirror://xorg/individual/app/xvinfo-1.1.4.tar.bz2
 mirror://xorg/individual/app/xwd-1.0.7.tar.bz2