diff options
| author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-03-08 22:57:05 +0000 |
|---|---|---|
| committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-03-08 22:57:05 +0000 |
| commit | b0dbd38ea6d61c64368a18d7a312a9b08033a4c5 (patch) | |
| tree | e5e3fb3c5eb2b2ff6066aa9548a8e3f49bf7bc38 /pkgs | |
| parent | 01c4e30a8a508667090d42ccd08b9f426ee9847b (diff) | |
| download | nixpkgs-b0dbd38ea6d61c64368a18d7a312a9b08033a4c5.tar nixpkgs-b0dbd38ea6d61c64368a18d7a312a9b08033a4c5.tar.gz nixpkgs-b0dbd38ea6d61c64368a18d7a312a9b08033a4c5.tar.bz2 nixpkgs-b0dbd38ea6d61c64368a18d7a312a9b08033a4c5.tar.lz nixpkgs-b0dbd38ea6d61c64368a18d7a312a9b08033a4c5.tar.xz nixpkgs-b0dbd38ea6d61c64368a18d7a312a9b08033a4c5.tar.zst nixpkgs-b0dbd38ea6d61c64368a18d7a312a9b08033a4c5.zip | |
Move libcroco and librsvg to top-level
svn path=/nixpkgs/trunk/; revision=32933
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/desktops/gnome-2/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/development/libraries/libcroco/default.nix (renamed from pkgs/desktops/gnome-2/desktop/libcroco/default.nix) | 0 | ||||
| -rw-r--r-- | pkgs/development/libraries/librsvg/default.nix (renamed from pkgs/desktops/gnome-2/desktop/librsvg/default.nix) | 0 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 6 |
4 files changed, 4 insertions, 7 deletions
diff --git a/pkgs/desktops/gnome-2/default.nix b/pkgs/desktops/gnome-2/default.nix index f0c1006a126..334bd5e7fc2 100644 --- a/pkgs/desktops/gnome-2/default.nix +++ b/pkgs/desktops/gnome-2/default.nix @@ -81,11 +81,6 @@ libwnck = callPackage ./desktop/libwnck { }; - # Not part of GNOME desktop, but provides CSS support for librsvg - libcroco = callPackage ./desktop/libcroco { }; - - librsvg = callPackage ./desktop/librsvg { }; - libgweather = callPackage ./desktop/libgweather { }; gvfs = callPackage ./desktop/gvfs { }; diff --git a/pkgs/desktops/gnome-2/desktop/libcroco/default.nix b/pkgs/development/libraries/libcroco/default.nix index 99604475e62..99604475e62 100644 --- a/pkgs/desktops/gnome-2/desktop/libcroco/default.nix +++ b/pkgs/development/libraries/libcroco/default.nix diff --git a/pkgs/desktops/gnome-2/desktop/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix index 86b818cd5a9..86b818cd5a9 100644 --- a/pkgs/desktops/gnome-2/desktop/librsvg/default.nix +++ b/pkgs/development/libraries/librsvg/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f30b764507a..eeab8e54fc4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3918,6 +3918,8 @@ let libcm = callPackage ../development/libraries/libcm { }; + libcroco = callPackage ../development/libraries/libcroco {}; + libctemplate = callPackage ../development/libraries/libctemplate { }; libcue = callPackage ../development/libraries/libcue { }; @@ -4171,6 +4173,8 @@ let libqalculate = callPackage ../development/libraries/libqalculate { }; + librsvg = callPackage ../development/libraries/librsvg { }; + librsync = callPackage ../development/libraries/librsync { }; libsigcxx = callPackage ../development/libraries/libsigcxx { }; @@ -5795,8 +5799,6 @@ let libsexy = callPackage ../development/libraries/libsexy { }; - librsvg = gnome.librsvg; - libsepol = callPackage ../os-specific/linux/libsepol { }; libsmbios = callPackage ../os-specific/linux/libsmbios { }; |