public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'staging', containing closure-size #7701

Browse Source
This commit is contained in:
Vladimír Čunát
2016-04-13 09:25:28 +02:00
parent 81cedab4f1 87b49397bf
commit 39ebb01d6e
882 changed files with 8958 additions and 2482 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/misc/cups/default.nix
View File

@@ -18,8 +18,11 @@ stdenv.mkDerivation {
sha256 = "1lyl3z01xhg9xb9c8m42398c6h9kw8qr6jwiv8bjdsjab11hv9rn";
};
# FIXME: the cups libraries contains some $out/share strings so can't be split.
outputs = [ "dev" "out" "doc" "man" ]; # TODO: above
buildInputs = [ pkgconfig zlib libjpeg libpng libtiff libusb gnutls libpaper ]
++ optionals stdenv.isLinux [ avahi pam dbus.libs acl ]
++ optionals stdenv.isLinux [ avahi pam dbus acl ]
++ optionals stdenv.isDarwin (with darwin; [
configd apple_sdk.frameworks.ApplicationServices
]);
@@ -68,6 +71,9 @@ stdenv.mkDerivation {
# Delete obsolete stuff that conflicts with cups-filters.
rm -rf $out/share/cups/banners $out/share/cups/data/testprint
mkdir $dev/bin
mv $out/bin/cups-config $dev/bin/
# Rename systemd files provided by CUPS
for f in $out/lib/systemd/system/*; do
substituteInPlace "$f" \

4
pkgs/misc/cups/drivers/canon/default.nix
View File

@@ -202,10 +202,10 @@ stdenv.mkDerivation rec {
cp libs/ThLB* $out/share/ufr2filter
)
patchelf --set-rpath "$out/lib32:${i686_libxml2}/lib" $out/lib32/libcanonufr2.so.1.0.0
patchelf --set-rpath "$out/lib32:${i686_libxml2.out}/lib" $out/lib32/libcanonufr2.so.1.0.0
patchelf --interpreter "$(cat ${i686_NIX_GCC}/nix-support/dynamic-linker)" --set-rpath "$out/lib32" $out/bin/cnpkmoduleufr2
patchelf --interpreter "$(cat ${i686_NIX_GCC}/nix-support/dynamic-linker)" --set-rpath "$out/lib32:${i686_libxml2}/lib" $out/bin/cnpkbidi
patchelf --interpreter "$(cat ${i686_NIX_GCC}/nix-support/dynamic-linker)" --set-rpath "$out/lib32:${i686_libxml2.out}/lib" $out/bin/cnpkbidi
makeWrapper "${ghostscript}/bin/gs" "$out/bin/gs" \
--prefix LD_LIBRARY_PATH ":" "$out/lib" \

4
pkgs/misc/cups/drivers/mfcj470dw/default.nix
View File

@@ -44,8 +44,8 @@ stdenv.mkDerivation rec {
--replace expr "${coreutils}/bin/expr" \
--replace rm "${coreutils}/bin/rm"
patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux.so.2 $out/opt/brother/Printers/mfcj470dw/lpd/brmfcj470dwfilter
patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux.so.2 $out/opt/brother/Printers/mfcj470dw/cupswrapper/brcupsconfpt1
patchelf --set-interpreter ${stdenv.glibc.out}/lib/ld-linux.so.2 $out/opt/brother/Printers/mfcj470dw/lpd/brmfcj470dwfilter
patchelf --set-interpreter ${stdenv.glibc.out}/lib/ld-linux.so.2 $out/opt/brother/Printers/mfcj470dw/cupswrapper/brcupsconfpt1
mkdir -p $out/lib/cups/filter/
ln -s $out/opt/brother/Printers/mfcj470dw/lpd/filtermfcj470dw $out/lib/cups/filter/brother_lpdwrapper_mfcj470dw

4
pkgs/misc/drivers/foo2zjs/default.nix
View File

@@ -1,5 +1,5 @@
x@{builderDefsPackage
, foomatic_filters, bc, unzip, ghostscript, udev, vim
, foomatic_filters, bc, unzip, ghostscript, systemd, vim
, ...}:
builderDefsPackage
(a :
@@ -36,7 +36,7 @@ rec {
''PIXMAPS=$out/share/pixmaps''
''UDEVBIN=$out/bin''
''UDEVDIR=$out/etc/udev/rules.d''
''UDEVD=${udev}/sbin/udevd''
''UDEVD=${systemd.udev.bin}/sbin/udevd''
''LIBUDEVDIR=$out/lib/udev/rules.d''
''USBDIR=$out/etc/hotplug/usb''
''FOODB=$out/share/foomatic/db/source''

2
pkgs/misc/emulators/retroarch/cores.nix
View File

@@ -207,7 +207,7 @@ in
extraBuildInputs = [ libpng SDL ];
}).override {
patchPhase = "sed -i -e 's,SDL_CONFIG=\".*\",SDL_CONFIG=\"${SDL}/bin/sdl-config\",' configure";
patchPhase = "sed -i -e 's,SDL_CONFIG=\".*\",SDL_CONFIG=\"${SDL.dev}/bin/sdl-config\",' configure";
configurePhase = "./configure";
};