From 8a732aecb82917185c98f60a5fefd0157d976549 Mon Sep 17 00:00:00 2001 From: Remy Goldschmidt Date: Thu, 5 Mar 2015 00:23:18 -0600 Subject: [PATCH] Fixed licenses, fixed platform, renamed packages --- pkgs/data/icons/numix-icon-theme-circle/default.nix | 3 ++- pkgs/data/icons/numix-icon-theme/default.nix | 3 ++- .../misc/themes/gtk3/{numix => numix-gtk-theme}/default.nix | 5 +++-- pkgs/top-level/all-packages.nix | 6 +++--- 4 files changed, 10 insertions(+), 7 deletions(-) rename pkgs/misc/themes/gtk3/{numix => numix-gtk-theme}/default.nix (83%) diff --git a/pkgs/data/icons/numix-icon-theme-circle/default.nix b/pkgs/data/icons/numix-icon-theme-circle/default.nix index 927812e43886..ef7c5476fc61 100644 --- a/pkgs/data/icons/numix-icon-theme-circle/default.nix +++ b/pkgs/data/icons/numix-icon-theme-circle/default.nix @@ -24,6 +24,7 @@ stdenv.mkDerivation rec { meta = { description = "Numix icon theme (circle version)"; homepage = https://numixproject.org; - platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.gpl3; + platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/data/icons/numix-icon-theme/default.nix b/pkgs/data/icons/numix-icon-theme/default.nix index fa4139492cab..cd515f11f5df 100644 --- a/pkgs/data/icons/numix-icon-theme/default.nix +++ b/pkgs/data/icons/numix-icon-theme/default.nix @@ -24,6 +24,7 @@ stdenv.mkDerivation rec { meta = { description = "Numix icon theme"; homepage = https://numixproject.org; - platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.gpl3; + platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/misc/themes/gtk3/numix/default.nix b/pkgs/misc/themes/gtk3/numix-gtk-theme/default.nix similarity index 83% rename from pkgs/misc/themes/gtk3/numix/default.nix rename to pkgs/misc/themes/gtk3/numix-gtk-theme/default.nix index 1a9077d36caf..ed6254a3e221 100644 --- a/pkgs/misc/themes/gtk3/numix/default.nix +++ b/pkgs/misc/themes/gtk3/numix-gtk-theme/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "2.2.3"; - name = "numix-${version}"; + name = "numix-gtk-theme-${version}"; src = fetchurl { url = "https://github.com/shimmerproject/Numix/archive/v${version}.tar.gz"; @@ -19,6 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "Numix GTK theme"; homepage = https://numixproject.org; - platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.gpl3; + platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9e4cfbdf7bbd..3998b4ab87c5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9527,9 +9527,9 @@ let nafees = callPackage ../data/fonts/nafees { }; - numix_icon_theme = callPackage ../data/icons/numix-icon-theme { }; + numix-icon-theme = callPackage ../data/icons/numix-icon-theme { }; - numix_icon_theme_circle = callPackage ../data/icons/numix-icon-theme-circle { }; + numix-icon-theme-circle = callPackage ../data/icons/numix-icon-theme-circle { }; oldstandard = callPackage ../data/fonts/oldstandard { }; @@ -12841,7 +12841,7 @@ let mate-themes = callPackage ../misc/themes/mate-themes { }; - numix = callPackage ../misc/themes/gtk3/numix { }; + numix-gtk-theme = callPackage ../misc/themes/gtk3/numix-gtk-theme { }; plasma52 = recurseIntoAttrs (callPackage ../desktops/plasma-5.2 { qt5 = qt54;