diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2021-06-25 15:53:01 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-25 15:53:01 +0200 |
| commit | 54cccb99def1db1e3c8546383c6e0a2e3edf6d99 (patch) | |
| tree | a0f51b1847ccc2a2d4ebb375d38d4ec0cdeaec94 /pkgs/top-level | |
| parent | 2607ce8867a7af5e4affcadb82ef05e102e50f1b (diff) | |
| parent | 8609f3fd20ed9a3ba925986bc55005689d84e6ef (diff) | |
| download | nixpkgs-54cccb99def1db1e3c8546383c6e0a2e3edf6d99.tar nixpkgs-54cccb99def1db1e3c8546383c6e0a2e3edf6d99.tar.gz nixpkgs-54cccb99def1db1e3c8546383c6e0a2e3edf6d99.tar.bz2 nixpkgs-54cccb99def1db1e3c8546383c6e0a2e3edf6d99.tar.lz nixpkgs-54cccb99def1db1e3c8546383c6e0a2e3edf6d99.tar.xz nixpkgs-54cccb99def1db1e3c8546383c6e0a2e3edf6d99.tar.zst nixpkgs-54cccb99def1db1e3c8546383c6e0a2e3edf6d99.zip | |
Merge pull request #127941 from liff/libwnck/3-is-default
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/aliases.nix | 1 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 5 | ||||
| -rw-r--r-- | pkgs/top-level/perl-packages.nix | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index cc4d33024b0..018b746a51f 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -419,6 +419,7 @@ mapAliases ({ libsexy = throw "libsexy has been removed from nixpkgs, as it's abandoned and no package needed it."; # 2019-12-10 libstdcxxHook = throw "libstdcxx hook has been removed because cc-wrapper is now directly aware of the c++ standard library intended to be used."; # 2020-06-22 libqmatrixclient = throw "libqmatrixclient was renamed to libquotient"; # added 2020-04-09 + libwnck3 = libwnck; lilypond-unstable = lilypond; # added 2021-03-11 links = links2; # added 2016-01-31 linux_rpi0 = linux_rpi1; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8f0e626eb98..5c78b0647f1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17071,9 +17071,8 @@ in libwmf = callPackage ../development/libraries/libwmf { }; - libwnck = libwnck2; - libwnck2 = callPackage ../development/libraries/libwnck { }; - libwnck3 = callPackage ../development/libraries/libwnck/3.x.nix { }; + libwnck = callPackage ../development/libraries/libwnck { }; + libwnck2 = callPackage ../development/libraries/libwnck/2.nix { }; libwpd = callPackage ../development/libraries/libwpd { }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index db2359def2b..36efc12582c 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8930,7 +8930,7 @@ let url = "mirror://cpan/authors/id/T/TS/TSCH/Gnome2-Wnck-0.16.tar.gz"; sha256 = "604a8ece88ac29f132d59b0caac27657ec31371c1606a4698a2160e88ac586e5"; }; - buildInputs = [ pkgs.libwnck pkgs.glib pkgs.gtk2 ]; + buildInputs = [ pkgs.libwnck2 pkgs.glib pkgs.gtk2 ]; propagatedBuildInputs = [ Gtk2 ]; meta = { description = "Perl interface to the Window Navigator Construction Kit"; |