MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-18 15:56:50 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

poppler: again downgrade the old version

Browse source 
poppler_0_18 can be removed per-package when they're upgraded
This commit is contained in:
Vladimír Čunát 2013-02-13 09:16:58 +01:00
parent 9adcb15b9d
commit b58f8f0ddb
2 changed files with 6 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/development/libraries/poppler/0.20.nix → pkgs/development/libraries/poppler/0.18.nix
View file

@ -6,11 +6,11 @@
}:
stdenv.mkDerivation rec {
name = "poppler-0.20.5";
name = "poppler-0.18.4";
src = fetchurl {
url = "${meta.homepage}${name}.tar.gz";
sha256 = "1djl0jbgz7m8kbg7sq0wklnlfav5vp7iplkryphvs781by509my6";
sha256 = "0bnl05al7mjndp2h0355946j59nfw76f5v0x57d47q68rm412hik";
};
propagatedBuildInputs = with xorg;

14
pkgs/top-level/all-packages.nix
View file

@ -4810,7 +4810,7 @@ let
gtkSupport = true;
qt4Support = false;
};
poppler_0_20 = callPackage ../development/libraries/poppler/0.20.nix {
poppler_0_18 = callPackage ../development/libraries/poppler/0.18.nix {
gtkSupport = true;
qt4Support = false;
};
@ -4819,10 +4819,6 @@ let
gtkSupport = false;
qt4Support = true;
};
popplerQt4_0_20 = poppler_0_20.override {
gtkSupport = false;
qt4Support = true;
};
popt = callPackage ../development/libraries/popt { };
@ -6724,9 +6720,7 @@ let
inherit (gnome) libglade;
};
calibre = callPackage ../applications/misc/calibre {
popplerQt4 = popplerQt4_0_20;
};
calibre = callPackage ../applications/misc/calibre { };
carrier = builderDefsPackage (import ../applications/networking/instant-messengers/carrier/2.5.0.nix) {
inherit fetchurl stdenv pkgconfig perl perlXMLParser libxml2 openssl nss
@ -7034,7 +7028,7 @@ let
evince = hiPrio (callPackage ../applications/misc/evince {
inherit (gnome) gnomedocutils gnomeicontheme libgnome
libgnomeui libglade scrollkeeper;
poppler = poppler_0_20;
poppler = poppler_0_18;
});
evolution_data_server = newScope (gnome) ../servers/evolution-data-server { };
@ -7440,7 +7434,7 @@ let
freefont_ttf xorg.fontmiscmisc xorg.fontbhttf
];
};
poppler = poppler_0_20;
poppler = poppler_0_18;
};
lingot = callPackage ../applications/audio/lingot {