Unverified Commit fcbacedb authored by Marco Rebhan's avatar Marco Rebhan
Browse files

gnustep: propagate dependencies

parent 4d96ec04

pkgs/by-name/gn/gnustep-back/package.nix

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

  fontconfig,

  freetype,

  gnustep-base,

  gnustep-gui,

  gnustep-make,

  libXft,

  libXmu,

  pkg-config,
@@ -24,7 +22,6 @@ clangStdenv.mkDerivation (finalAttrs: { 
  };



  nativeBuildInputs = [

    gnustep-make

    pkg-config

    wrapGNUstepAppsHook

  ];
@@ -33,12 +30,12 @@ clangStdenv.mkDerivation (finalAttrs: { 
    cairo

    fontconfig

    freetype

    gnustep-base

    gnustep-gui

    libXft

    libXmu

  ];



  propagatedBuildInputs = [ gnustep-gui ];



  meta = {

    description = "Generic backend for GNUstep";

    mainProgram = "gpbs";

pkgs/by-name/gn/gnustep-base/package.nix

+4 −1
Original line number Diff line number Diff line
@@ -43,11 +43,14 @@ clangStdenv.mkDerivation (finalAttrs: { 
  ];



  nativeBuildInputs = [

    gnustep-make

    pkg-config

    wrapGNUstepAppsHook

  ];



  propagatedNativeBuildInputs = [

    gnustep-make

  ];



  propagatedBuildInputs = [

    aspell

    audiofile

pkgs/by-name/gn/gnustep-gui/package.nix

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

  fetchzip,

  gnustep-base,

  gnustep-make,

  wrapGNUstepAppsHook,

}:
@@ -16,12 +15,9 @@ clangStdenv.mkDerivation (finalAttrs: { 
    sha256 = "sha256-+4XEJ6PKpantbIbyNroFMaNBTFffkuW/ajSocGQO9Mo=";

  };



  nativeBuildInputs = [

    gnustep-make

    wrapGNUstepAppsHook

  ];

  nativeBuildInputs = [ wrapGNUstepAppsHook ];



  buildInputs = [ gnustep-base ];

  propagatedBuildInputs = [ gnustep-base ];



  patches = [

    ./fixup-all.patch

pkgs/by-name/gn/gnustep-libobjc/package.nix

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ clangStdenv.mkDerivation (finalAttrs: { 
  };



  nativeBuildInputs = [ cmake ];



  buildInputs = [ robin-map ];



  cmakeFlags = [ "-DCMAKE_INSTALL_LIBDIR=lib" ];

pkgs/by-name/gn/gnustep-systempreferences/package.nix

+2 −12
Original line number Diff line number Diff line
@@ -3,9 +3,6 @@ 
  clangStdenv,

  fetchurl,

  gnustep-back,

  gnustep-base,

  gnustep-gui,

  gnustep-make,

  wrapGNUstepAppsHook,

}:
@@ -18,16 +15,9 @@ clangStdenv.mkDerivation (finalAttrs: { 
    sha256 = "1fg7c3ihfgvl6n21rd17fs9ivx3l8ps874m80vz86n1callgs339";

  };



  nativeBuildInputs = [

    gnustep-make

    wrapGNUstepAppsHook

  ];

  nativeBuildInputs = [ wrapGNUstepAppsHook ];



  buildInputs = [

    gnustep-back

    gnustep-base

    gnustep-gui

  ];

  buildInputs = [ gnustep-back ];



  meta = {

    description = "Settings manager for the GNUstep environment and its applications";