git.iko.soy/typeable/nixpkgs
on master help sign in
xorg.xcalc: 1.0.7 -> 1.1.0

xcalc: ensure "app-defaults" resources are installed+found, works now

commit813799a6cb4e6d45bd396f2d1d842ecb09b48c1d authorWill Dietz <w@wdtz.org> dateTue 11 Jun 2019, 17:10 (7 years ago) parent0d576d7
3 files changed+15−4
pkgs/servers/x11/xorg/default.nix+3−3 pkgs/servers/x11/xorg/overrides.nix+11 pkgs/servers/x11/xorg/tarballs.list+1−1
pkgs/servers/x11/xorg/default.nix+3−3
@@ -1405,11 +1405,11 @@ lib.makeScope newScope (self: with self; {
14051405 }) {};
14061406
14071407 xcalc = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXaw, xorgproto, libXt }: stdenv.mkDerivation {
1408− name = "xcalc-1.0.7";
1408+ name = "xcalc-1.1.0";
14091409 builder = ./builder.sh;
14101410 src = fetchurl {
1411− url = mirror://xorg/individual/app/xcalc-1.0.7.tar.bz2;
1412− sha256 = "08bzaldi76vrj7350d7b04pq7qa1qhi81x8i806yv42zcp8p3lkh";
1411+ url = mirror://xorg/individual/app/xcalc-1.1.0.tar.bz2;
1412+ sha256 = "1sxmlcb0sb3h4z05kl5l0kxnhrc0h8c74p9m3zdc7bv58jaldmym";
14131413 };
14141414 hardeningDisable = [ "bindnow" "relro" ];
14151415 nativeBuildInputs = [ pkgconfig ];
pkgs/servers/x11/xorg/overrides.nix+11
@@ -699,4 +699,15 @@ self: super:
699699 rm $out/bin/xkeystone
700700 '';
701701 });
702+
703+ xcalc = super.xcalc.overrideAttrs (attrs: {
704+ configureFlags = attrs.configureFlags or [] ++ [
705+ "--with-appdefaultdir=${placeholder "out"}/share/X11/app-defaults"
706+ ];
707+ nativeBuildInputs = attrs.nativeBuildInputs or [] ++ [ makeWrapper ];
708+ postInstall = ''
709+ wrapProgram $out/bin/xcalc \
710+ --set XAPPLRESDIR ${placeholder "out"}/share/X11/app-defaults
711+ '';
712+ });
702713}
pkgs/servers/x11/xorg/tarballs.list+1−1
@@ -28,7 +28,7 @@ mirror://xorg/individual/app/viewres-1.0.5.tar.bz2
2828mirror://xorg/individual/app/x11perf-1.6.1.tar.bz2
2929mirror://xorg/individual/app/xauth-1.0.10.tar.bz2
3030mirror://xorg/individual/app/xbacklight-1.2.2.tar.bz2
31−mirror://xorg/individual/app/xcalc-1.0.7.tar.bz2
31+mirror://xorg/individual/app/xcalc-1.1.0.tar.bz2
3232mirror://xorg/individual/app/xclock-1.0.8.tar.bz2
3333mirror://xorg/individual/app/xcmsdb-1.0.5.tar.bz2
3434mirror://xorg/individual/app/xcompmgr-1.1.8.tar.bz2