diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2019-09-04 00:58:51 +0200 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2019-09-06 02:54:53 +0200 |
| commit | 684bad056950880d05e4534e683362c6a0abce55 (patch) | |
| tree | 042cd32d4358c34d271ba1a6dd9c9d84644d564d /pkgs | |
| parent | 72e7d569a7157e6d1a541dc87f07c1843feb3350 (diff) | |
| download | nixpkgs-684bad056950880d05e4534e683362c6a0abce55.tar nixpkgs-684bad056950880d05e4534e683362c6a0abce55.tar.gz nixpkgs-684bad056950880d05e4534e683362c6a0abce55.tar.bz2 nixpkgs-684bad056950880d05e4534e683362c6a0abce55.tar.lz nixpkgs-684bad056950880d05e4534e683362c6a0abce55.tar.xz nixpkgs-684bad056950880d05e4534e683362c6a0abce55.tar.zst nixpkgs-684bad056950880d05e4534e683362c6a0abce55.zip | |
gtk: move expressions
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/gtk/01-build-Fix-path-handling-in-pkgconfig.patch (renamed from pkgs/development/libraries/gtk+/01-build-Fix-path-handling-in-pkgconfig.patch) | 0 | ||||
| -rw-r--r-- | pkgs/development/libraries/gtk/2.0-darwin-x11.patch (renamed from pkgs/development/libraries/gtk+/2.0-darwin-x11.patch) | 0 | ||||
| -rw-r--r-- | pkgs/development/libraries/gtk/2.0-immodules.cache.patch (renamed from pkgs/development/libraries/gtk+/2.0-immodules.cache.patch) | 0 | ||||
| -rw-r--r-- | pkgs/development/libraries/gtk/2.x.nix (renamed from pkgs/development/libraries/gtk+/2.x.nix) | 0 | ||||
| -rw-r--r-- | pkgs/development/libraries/gtk/3.0-darwin-x11.patch (renamed from pkgs/development/libraries/gtk+/3.0-darwin-x11.patch) | 0 | ||||
| -rw-r--r-- | pkgs/development/libraries/gtk/3.0-immodules.cache.patch (renamed from pkgs/development/libraries/gtk+/3.0-immodules.cache.patch) | 0 | ||||
| -rw-r--r-- | pkgs/development/libraries/gtk/3.x.nix (renamed from pkgs/development/libraries/gtk+/3.x.nix) | 0 | ||||
| -rw-r--r-- | pkgs/development/libraries/gtk/gtk2-theme-paths.patch (renamed from pkgs/development/libraries/gtk+/gtk2-theme-paths.patch) | 0 | ||||
| -rw-r--r-- | pkgs/development/libraries/gtk/gtk3-setup-hook.sh (renamed from pkgs/development/libraries/gtk+/gtk3-setup-hook.sh) | 0 | ||||
| -rw-r--r-- | pkgs/development/libraries/gtk/setup-hook.sh (renamed from pkgs/development/libraries/gtk+/setup-hook.sh) | 0 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
11 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/libraries/gtk+/01-build-Fix-path-handling-in-pkgconfig.patch b/pkgs/development/libraries/gtk/01-build-Fix-path-handling-in-pkgconfig.patch index ec69a12514f..ec69a12514f 100644 --- a/pkgs/development/libraries/gtk+/01-build-Fix-path-handling-in-pkgconfig.patch +++ b/pkgs/development/libraries/gtk/01-build-Fix-path-handling-in-pkgconfig.patch diff --git a/pkgs/development/libraries/gtk+/2.0-darwin-x11.patch b/pkgs/development/libraries/gtk/2.0-darwin-x11.patch index 9725cfb8426..9725cfb8426 100644 --- a/pkgs/development/libraries/gtk+/2.0-darwin-x11.patch +++ b/pkgs/development/libraries/gtk/2.0-darwin-x11.patch diff --git a/pkgs/development/libraries/gtk+/2.0-immodules.cache.patch b/pkgs/development/libraries/gtk/2.0-immodules.cache.patch index 1b8231756e7..1b8231756e7 100644 --- a/pkgs/development/libraries/gtk+/2.0-immodules.cache.patch +++ b/pkgs/development/libraries/gtk/2.0-immodules.cache.patch diff --git a/pkgs/development/libraries/gtk+/2.x.nix b/pkgs/development/libraries/gtk/2.x.nix index f1a53390467..f1a53390467 100644 --- a/pkgs/development/libraries/gtk+/2.x.nix +++ b/pkgs/development/libraries/gtk/2.x.nix diff --git a/pkgs/development/libraries/gtk+/3.0-darwin-x11.patch b/pkgs/development/libraries/gtk/3.0-darwin-x11.patch index 86631634b5b..86631634b5b 100644 --- a/pkgs/development/libraries/gtk+/3.0-darwin-x11.patch +++ b/pkgs/development/libraries/gtk/3.0-darwin-x11.patch diff --git a/pkgs/development/libraries/gtk+/3.0-immodules.cache.patch b/pkgs/development/libraries/gtk/3.0-immodules.cache.patch index bbe5f28dbd3..bbe5f28dbd3 100644 --- a/pkgs/development/libraries/gtk+/3.0-immodules.cache.patch +++ b/pkgs/development/libraries/gtk/3.0-immodules.cache.patch diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk/3.x.nix index aee97d9bad0..aee97d9bad0 100644 --- a/pkgs/development/libraries/gtk+/3.x.nix +++ b/pkgs/development/libraries/gtk/3.x.nix diff --git a/pkgs/development/libraries/gtk+/gtk2-theme-paths.patch b/pkgs/development/libraries/gtk/gtk2-theme-paths.patch index edd69b07807..edd69b07807 100644 --- a/pkgs/development/libraries/gtk+/gtk2-theme-paths.patch +++ b/pkgs/development/libraries/gtk/gtk2-theme-paths.patch diff --git a/pkgs/development/libraries/gtk+/gtk3-setup-hook.sh b/pkgs/development/libraries/gtk/gtk3-setup-hook.sh index bddeb2d25d5..bddeb2d25d5 100644 --- a/pkgs/development/libraries/gtk+/gtk3-setup-hook.sh +++ b/pkgs/development/libraries/gtk/gtk3-setup-hook.sh diff --git a/pkgs/development/libraries/gtk+/setup-hook.sh b/pkgs/development/libraries/gtk/setup-hook.sh index c2b0ab502db..c2b0ab502db 100644 --- a/pkgs/development/libraries/gtk+/setup-hook.sh +++ b/pkgs/development/libraries/gtk/setup-hook.sh diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 13a1f6087be..2296119769d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11216,7 +11216,7 @@ in elementary-cmake-modules = callPackage ../development/libraries/elementary-cmake-modules { }; - gtk2 = callPackage ../development/libraries/gtk+/2.x.nix { + gtk2 = callPackage ../development/libraries/gtk/2.x.nix { inherit (darwin.apple_sdk.frameworks) AppKit Cocoa; }; @@ -11226,7 +11226,7 @@ in gdktarget = "x11"; }; - gtk3 = callPackage ../development/libraries/gtk+/3.x.nix { + gtk3 = callPackage ../development/libraries/gtk/3.x.nix { inherit (darwin.apple_sdk.frameworks) AppKit Cocoa; }; |