Commit 81237a9e authored by Jan Tojnar's avatar Jan Tojnar
Browse files

caribou: Move from gnome scope to top-level

parent e186593e

pkgs/desktops/gnome/core/caribou/default.nix→pkgs/by-name/ca/caribou/package.nix

+1 −4
Original line number Diff line number Diff line
@@ -92,10 +92,7 @@ stdenv.mkDerivation rec { 
  '';



  passthru = {

    updateScript = gnome.updateScript {

      packageName = "caribou";

      attrPath = "gnome.caribou";

    };

    updateScript = gnome.updateScript { packageName = "caribou"; };

  };



  meta = with lib; {

pkgs/by-name/ci/cinnamon-common/package.nix

+3 −3
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ 
, wrapGAppsHook3

, libxml2

, gtk-doc

, gnome

, caribou

, python3

, keybinder3

, cairo
@@ -113,7 +113,7 @@ stdenv.mkDerivation rec { 


    # bindings

    cairo

    gnome.caribou

    caribou

    keybinder3

    upower

    xapp
@@ -176,7 +176,7 @@ stdenv.mkDerivation rec { 
  preFixup = ''

    # https://github.com/NixOS/nixpkgs/issues/101881

    gappsWrapperArgs+=(

      --prefix XDG_DATA_DIRS : "${gnome.caribou}/share"

      --prefix XDG_DATA_DIRS : "${caribou}/share"

    )



    buildPythonPath "$out ${python3.pkgs.python-xapp}"

pkgs/by-name/ci/cinnamon-screensaver/package.nix

+3 −3
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
, libxslt

, gtk3

, libgnomekbd

, gnome

, caribou

, libtool

, wrapGAppsHook3

, gobject-introspection
@@ -73,7 +73,7 @@ stdenv.mkDerivation rec { 
    cinnamon-desktop

    cinnamon-common

    libgnomekbd

    gnome.caribou

    caribou

  ];



  postPatch = ''
@@ -89,7 +89,7 @@ stdenv.mkDerivation rec { 
  preFixup = ''

    # https://github.com/NixOS/nixpkgs/issues/101881

    gappsWrapperArgs+=(

      --prefix XDG_DATA_DIRS : "${gnome.caribou}/share"

      --prefix XDG_DATA_DIRS : "${caribou}/share"

    )

  '';

pkgs/desktops/gnome/default.nix

+1 −2
Original line number Diff line number Diff line
@@ -17,8 +17,6 @@ in 


#### Core (http://ftp.acc.umu.se/pub/GNOME/core/)



  caribou = callPackage ./core/caribou { };



  gnome-bluetooth = callPackage ./core/gnome-bluetooth { };



  gnome-bluetooth_1_0 = callPackage ./core/gnome-bluetooth/1.0 { };
@@ -97,6 +95,7 @@ in 
  aisleriot = lib.warn "The ‘gnome.aisleriot’ was moved to top-level. Please use ‘pkgs.aisleriot’ directly." pkgs.aisleriot; # Added on 2024-08-11.

  atomix = lib.warn "The ‘gnome.atomix’ was moved to top-level. Please use ‘pkgs.atomix’ directly." pkgs.atomix; # Added on 2024-08-11.

  baobab = lib.warn "The ‘gnome.baobab’ was moved to top-level. Please use ‘pkgs.baobab’ directly." pkgs.baobab; # Added on 2024-06-22.

  caribou = lib.warn "The ‘gnome.caribou’ was moved to top-level. Please use ‘pkgs.caribou’ directly." pkgs.caribou; # Added on 2024-08-11.

  cheese = lib.warn "The ‘gnome.cheese’ was moved to top-level. Please use ‘pkgs.cheese’ directly." pkgs.cheese; # Added on 2024-06-22.

  dconf-editor = lib.warn "The ‘gnome.dconf-editor’ was moved to top-level. Please use ‘pkgs.dconf-editor’ directly." pkgs.dconf-editor; # Added on 2024-06-22.

  devhelp = lib.warn "The ‘gnome.devhelp’ was moved to top-level. Please use ‘pkgs.devhelp’ directly." pkgs.devhelp; # Added on 2024-06-22.