diff options
| author | Will Dietz <w@wdtz.org> | 2019-06-11 17:10:32 -0500 |
|---|---|---|
| committer | Will Dietz <w@wdtz.org> | 2019-06-12 00:00:10 -0500 |
| commit | 813799a6cb4e6d45bd396f2d1d842ecb09b48c1d (patch) | |
| tree | 7bab781dccfabc1ab028d3ff3d229577b669d448 | |
| parent | 0d576d7eb875b83ada78dca788981cccf2e4d883 (diff) | |
| download | nixlib-813799a6cb4e6d45bd396f2d1d842ecb09b48c1d.tar nixlib-813799a6cb4e6d45bd396f2d1d842ecb09b48c1d.tar.gz nixlib-813799a6cb4e6d45bd396f2d1d842ecb09b48c1d.tar.bz2 nixlib-813799a6cb4e6d45bd396f2d1d842ecb09b48c1d.tar.lz nixlib-813799a6cb4e6d45bd396f2d1d842ecb09b48c1d.tar.xz nixlib-813799a6cb4e6d45bd396f2d1d842ecb09b48c1d.tar.zst nixlib-813799a6cb4e6d45bd396f2d1d842ecb09b48c1d.zip | |
xorg.xcalc: 1.0.7 -> 1.1.0
xcalc: ensure "app-defaults" resources are installed+found, works now
| -rw-r--r-- | pkgs/servers/x11/xorg/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/servers/x11/xorg/overrides.nix | 11 | ||||
| -rw-r--r-- | pkgs/servers/x11/xorg/tarballs.list | 2 |
3 files changed, 15 insertions, 4 deletions
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 34aa18465c86..1f5de9dba105 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -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 ]; diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 8a1eef6ac1d3..6bcf4d08f386 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -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 + ''; + }); } diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index 5326ab5a55a6..6ae5443f2ed8 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -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 |