Unverified Commit 76a98bb0 authored by quantenzitrone's avatar quantenzitrone
Browse files

libxaw3d: refactor and rename from Xaw3d 

rename to upstream package name to fit package naming conventions

refactor:
- switch to gitlab source
- removed unused libxp dependency
- enable strictDeps
- add updateScript
parent b01ac67a

pkgs/applications/editors/emacs/make-emacs.nix

+2 −2
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 
{

  lib,

  stdenv,

  Xaw3d,

  libxaw3d,

  acl,

  alsa-lib,

  apple-sdk,
@@ -333,7 +333,7 @@ stdenv.mkDerivation (finalAttrs: { 
    libwebp

  ]

  ++ lib.optionals withX [

    Xaw3d

    libxaw3d

    giflib

    libxaw

    libxpm

pkgs/by-name/gv/gv/package.nix

+2 −2
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
  stdenv,

  fetchurl,

  libxext,

  Xaw3d,

  libxaw3d,

  ghostscriptX,

  perl,

  pkg-config,
@@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: { 
  nativeBuildInputs = [ pkg-config ];

  buildInputs = [

    libxext

    Xaw3d

    libxaw3d

    ghostscriptX

    perl

  ]

pkgs/by-name/xa/Xaw3d/package.nix→pkgs/by-name/li/libxaw3d/package.nix

+64 −0
Original line number Diff line number Diff line 
{

  lib,

  stdenv,

  fetchurl,

  fetchFromGitLab,

  autoreconfHook,

  pkg-config,

  util-macros,

  bison,

  flex,

  pkg-config,

  libxext,

  libxmu,

  libxpm,

  libxp,

  libxt,

  xorgproto,

  nix-update-script,

}:



stdenv.mkDerivation (finalAttrs: {

  pname = "Xaw3d";

  pname = "libxaw3d";

  version = "1.6.6";



  src = fetchurl {

    url = "https://www.x.org/releases/individual/lib/libXaw3d-${finalAttrs.version}.tar.xz";

    sha256 = "sha256-pBw+NxNa1hax8ou95wACr788tZow3zQUH4KdMurchkY=";

  src = fetchFromGitLab {

    domain = "gitlab.freedesktop.org";

    group = "xorg";

    owner = "lib";

    repo = "libxaw3d";

    tag = "libXaw3d-${finalAttrs.version}";

    hash = "sha256-7w5FnvxbztfdH7QPPqvHyJdAhTyNfe0Je4x+J80dJIY=";

  };



  strictDeps = true;



  nativeBuildInputs = [

    autoreconfHook

    pkg-config

    util-macros

    bison

    flex

  ];



  buildInputs = [

    libxext

    libxpm

    libxp

  ];



  propagatedBuildInputs = [

    libxmu

    libxt

    xorgproto

  ];



  passthru = {

    updateScript = nix-update-script { extraArgs = [ "--version-regex=libXaw3d-(.*)" ]; };

  };



  meta = {

    description = "3D widget set based on the Athena Widget set";

    platforms = lib.platforms.unix;

    description = "3D appearance variant of the X Athena Widget Set";

    homepage = "https://gitlab.freedesktop.org/xorg/lib/libxaw3d";

    license = lib.licenses.mit;

    maintainers = [ ];

    platforms = lib.platforms.unix;

  };

})

pkgs/by-name/xf/xfig/package.nix

+2 −2
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
  libxmu,

  libxi,

  libxp,

  Xaw3d,

  libxaw3d,

  libxaw,

  libxft,

  fig2dev,
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec { 
    libxmu

    libxi

    libxp

    Xaw3d

    libxaw3d

    libxaw

    libxft

  ];

pkgs/by-name/xv/xvkbd/package.nix

+2 −2
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
  libxpm,

  pkg-config,

  xorgproto,

  Xaw3d,

  libxaw3d,

}:



stdenv.mkDerivation (finalAttrs: {
@@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { 
    libxtst

    xorgproto

    libxi

    Xaw3d

    libxaw3d

    libxpm

  ];