Unverified Commit 4d96ec04 authored by Marco Rebhan's avatar Marco Rebhan
Browse files

gnustep: move GNUstep packages to by-name 

It used newScope before which doesn't work well if at all with overlays.
parent bafca6cb

pkgs/desktops/gnustep/back/default.nix→pkgs/by-name/gn/gnustep-back/package.nix

+54 −0
Original line number Diff line number Diff line 
{ lib

, stdenv

, make

, wrapGNUstepAppsHook

, cairo

, fetchzip

, base

, gui

, fontconfig

, freetype

, pkg-config

, libXft

, libXmu

{

  lib,

  clangStdenv,

  fetchzip,

  cairo,

  fontconfig,

  freetype,

  gnustep-base,

  gnustep-gui,

  gnustep-make,

  libXft,

  libXmu,

  pkg-config,

  wrapGNUstepAppsHook,

}:



stdenv.mkDerivation (finalAttrs: {

clangStdenv.mkDerivation (finalAttrs: {

  pname = "gnustep-back";

  version = "0.31.0";
@@ -22,15 +23,32 @@ stdenv.mkDerivation (finalAttrs: { 
    sha256 = "sha256-CjcoXlKiPVPJMOdrBKjxiNauTZvLcId5Lb8DzbgBbBg=";

  };



  nativeBuildInputs = [ make pkg-config wrapGNUstepAppsHook ];

  buildInputs = [ cairo base gui fontconfig freetype libXft libXmu ];

  nativeBuildInputs = [

    gnustep-make

    pkg-config

    wrapGNUstepAppsHook

  ];



  buildInputs = [

    cairo

    fontconfig

    freetype

    gnustep-base

    gnustep-gui

    libXft

    libXmu

  ];



  meta = {

    description = "Generic backend for GNUstep";

    mainProgram = "gpbs";

    homepage = "https://gnustep.github.io/";

    license = lib.licenses.lgpl2Plus;

    maintainers = with lib.maintainers; [ ashalkhakov matthewbauer dblsaiko ];

    maintainers = with lib.maintainers; [

      ashalkhakov

      dblsaiko

      matthewbauer

    ];

    platforms = lib.platforms.linux;

  };

})

pkgs/desktops/gnustep/base/default.nix→pkgs/by-name/gn/gnustep-base/package.nix

+29 −24
Original line number Diff line number Diff line 
{

  lib,

  stdenv,

  clangStdenv,

  fetchpatch,

  fetchzip,

  aspell,

  audiofile,

  make,

  wrapGNUstepAppsHook,

  binutils-unwrapped,

  cups,

  fetchzip,

  fetchpatch,

  giflib,

  gmp,

  gnustep-libobjc,

  gnustep-make,

  gnutls,

  icu,

  libffi,

  binutils-unwrapped,

  libgcrypt,

  libiberty,

  libiconv,

  libjpeg,

  libtiff,

  libpng,

  giflib,

  libtiff,

  libxml2,

  libxslt,

  libiconv,

  libobjc,

  libgcrypt,

  icu,

  pkg-config,

  portaudio,

  libiberty,

  wrapGNUstepAppsHook,

}:



stdenv.mkDerivation (finalAttrs: {

clangStdenv.mkDerivation (finalAttrs: {

  pname = "gnustep-base";

  version = "1.29.0";



  src = fetchzip {

    url = "ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-base-${finalAttrs.version}.tar.gz";

    hash = "sha256-4fjdsLBsYEDxLOFrq17dKii2sLKvOaFCu0cw3qQtM5U=";

  };



  outputs = [

    "out"

    "dev"

    "lib"

  ];



  nativeBuildInputs = [

    gnustep-make

    pkg-config

    make

    wrapGNUstepAppsHook

  ];



  propagatedBuildInputs = [

    aspell

    audiofile

    binutils-unwrapped

    cups

    giflib

    gmp

    gnustep-libobjc

    gnutls

    icu

    libffi

    binutils-unwrapped

    libgcrypt

    libiberty

    libiconv

    libjpeg

    libtiff

    libpng

    giflib

    libtiff

    libxml2

    libxslt

    libiconv

    libobjc

    libgcrypt

    icu

    portaudio

    libiberty

  ];



  patches = [

    ./fixup-paths.patch

    # https://github.com/gnustep/libs-base/issues/212 / https://www.sogo.nu/bugs/view.php?id=5416#c15585
@@ -95,8 +100,8 @@ stdenv.mkDerivation (finalAttrs: { 
    license = lib.licenses.lgpl2Plus;

    maintainers = with lib.maintainers; [

      ashalkhakov

      matthewbauer

      dblsaiko

      matthewbauer

    ];

    platforms = lib.platforms.linux;

  };

pkgs/desktops/gnustep/gui/default.nix→pkgs/by-name/gn/gnustep-gui/package.nix

+10 −8
Original line number Diff line number Diff line 
{

  lib,

  stdenv,

  make,

  wrapGNUstepAppsHook,

  clangStdenv,

  fetchzip,

  base,

  gnustep-base,

  gnustep-make,

  wrapGNUstepAppsHook,

}:



stdenv.mkDerivation (finalAttrs: {

clangStdenv.mkDerivation (finalAttrs: {

  version = "0.31.1";

  pname = "gnustep-gui";
@@ -17,14 +17,16 @@ stdenv.mkDerivation (finalAttrs: { 
  };



  nativeBuildInputs = [

    make

    gnustep-make

    wrapGNUstepAppsHook

  ];

  buildInputs = [ base ];



  buildInputs = [ gnustep-base ];



  patches = [

    ./fixup-all.patch

  ];



  meta = {

    changelog = "https://github.com/gnustep/libs-gui/releases/tag/gui-${

      builtins.replaceStrings [ "." ] [ "_" ] finalAttrs.version
@@ -34,8 +36,8 @@ stdenv.mkDerivation (finalAttrs: { 
    license = lib.licenses.lgpl2Plus;

    maintainers = with lib.maintainers; [

      ashalkhakov

      matthewbauer

      dblsaiko

      matthewbauer

    ];

    platforms = lib.platforms.linux;

  };