Unverified Commit 21612c5a authored by Nick Cao's avatar Nick Cao Committed by GitHub
Browse files

Merge pull request #216389 from SuperSandro2000/gtksourceview 

gtksourceview: remove with lib over entire file
parents 090ecda0 56a285e2

pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix

+3 −5
Original line number Diff line number Diff line
@@ -4,8 +4,6 @@ 
, testers

}:



with lib;



stdenv.mkDerivation (finalAttrs: {

  pname = "gtksourceview";

  version = "2.10.5";
@@ -17,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: { 
    sha256 = "c585773743b1df8a04b1be7f7d90eecdf22681490d6810be54c81a7ae152191e";

  };



  patches = optionals stdenv.isDarwin [

  patches = lib.optionals stdenv.isDarwin [

    (fetchpatch {

      name = "change-igemacintegration-to-gtkosxapplication.patch";

      url = "https://gitlab.gnome.org/GNOME/gtksourceview/commit/e88357c5f210a8796104505c090fb6a04c213902.patch";
@@ -35,11 +33,11 @@ stdenv.mkDerivation (finalAttrs: { 
    atk cairo glib gtk2

    pango libxml2Python perl

    gettext

  ] ++ optionals stdenv.isDarwin [

  ] ++ lib.optionals stdenv.isDarwin [

    gnome-common gtk-mac-integration-gtk2

  ];



  preConfigure = optionalString stdenv.isDarwin ''

  preConfigure = lib.optionalString stdenv.isDarwin ''

    intltoolize --force

  '';