Skip to content
Permalink
Browse files

Merge pull request #63018 from dtzWill/update/xclock-1.1.0

xorg.xcalc: 1.0.7 -> 1.1.0
  • Loading branch information...
teto committed Jun 12, 2019
2 parents b647471 + 813799a commit 3f00ca96f2da69e93a0b4a8bbf1b22bc651c2871
Showing with 15 additions and 4 deletions.
  1. +3 −3 pkgs/servers/x11/xorg/default.nix
  2. +11 −0 pkgs/servers/x11/xorg/overrides.nix
  3. +1 −1 pkgs/servers/x11/xorg/tarballs.list
@@ -1405,11 +1405,11 @@ lib.makeScope newScope (self: with self; {
}) {};

xcalc = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXaw, xorgproto, libXt }: stdenv.mkDerivation {
name = "xcalc-1.0.7";
name = "xcalc-1.1.0";
builder = ./builder.sh;
src = fetchurl {
url = mirror://xorg/individual/app/xcalc-1.0.7.tar.bz2;
sha256 = "08bzaldi76vrj7350d7b04pq7qa1qhi81x8i806yv42zcp8p3lkh";
url = mirror://xorg/individual/app/xcalc-1.1.0.tar.bz2;
sha256 = "1sxmlcb0sb3h4z05kl5l0kxnhrc0h8c74p9m3zdc7bv58jaldmym";
};
hardeningDisable = [ "bindnow" "relro" ];
nativeBuildInputs = [ pkgconfig ];
@@ -699,4 +699,15 @@ self: super:
rm $out/bin/xkeystone
'';
});

xcalc = super.xcalc.overrideAttrs (attrs: {
configureFlags = attrs.configureFlags or [] ++ [
"--with-appdefaultdir=${placeholder "out"}/share/X11/app-defaults"
];
nativeBuildInputs = attrs.nativeBuildInputs or [] ++ [ makeWrapper ];
postInstall = ''
wrapProgram $out/bin/xcalc \
--set XAPPLRESDIR ${placeholder "out"}/share/X11/app-defaults
'';
});
}
@@ -28,7 +28,7 @@ mirror://xorg/individual/app/viewres-1.0.5.tar.bz2
mirror://xorg/individual/app/x11perf-1.6.1.tar.bz2
mirror://xorg/individual/app/xauth-1.0.10.tar.bz2
mirror://xorg/individual/app/xbacklight-1.2.2.tar.bz2
mirror://xorg/individual/app/xcalc-1.0.7.tar.bz2
mirror://xorg/individual/app/xcalc-1.1.0.tar.bz2
mirror://xorg/individual/app/xclock-1.0.8.tar.bz2
mirror://xorg/individual/app/xcmsdb-1.0.5.tar.bz2
mirror://xorg/individual/app/xcompmgr-1.1.8.tar.bz2

0 comments on commit 3f00ca9

Please sign in to comment.
You can’t perform that action at this time.