diff options
author | Alyssa Ross <hi@alyssa.is> | 2021-01-26 18:06:19 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2021-01-26 18:21:18 +0000 |
commit | 7ac6743433dd45ceaead2ca96f6356dc0d064ce6 (patch) | |
tree | b68ec89d7d2a8d2b6e6b1ff94ba26d6af4096350 /nixpkgs/pkgs/misc/cups/drivers/samsung | |
parent | c5c7451dbef37b51f52792d6395a670ef5183d27 (diff) | |
parent | 891f607d5301d6730cb1f9dcf3618bcb1ab7f10e (diff) | |
download | nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.tar nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.tar.gz nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.tar.bz2 nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.tar.lz nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.tar.xz nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.tar.zst nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.zip |
Merge commit '891f607d5301d6730cb1f9dcf3618bcb1ab7f10e'
Diffstat (limited to 'nixpkgs/pkgs/misc/cups/drivers/samsung')
4 files changed, 14 insertions, 14 deletions
diff --git a/nixpkgs/pkgs/misc/cups/drivers/samsung/1.00.36/default.nix b/nixpkgs/pkgs/misc/cups/drivers/samsung/1.00.36/default.nix index 4088ce700de2..2ea0e2538539 100644 --- a/nixpkgs/pkgs/misc/cups/drivers/samsung/1.00.36/default.nix +++ b/nixpkgs/pkgs/misc/cups/drivers/samsung/1.00.36/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cups, libusb-compat-0_1, libxml2, perl }: +{ lib, stdenv, fetchurl, cups, libusb-compat-0_1, libxml2, perl }: let @@ -87,10 +87,10 @@ in stdenv.mkDerivation rec { preFixup = '' for bin in "$out/bin/"*; do patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$bin" - patchelf --set-rpath "$out/lib:${stdenv.lib.getLib cups}/lib" "$bin" + patchelf --set-rpath "$out/lib:${lib.getLib cups}/lib" "$bin" done - patchelf --set-rpath "$out/lib:${stdenv.lib.getLib cups}/lib" "$out/lib/libscmssc.so" + patchelf --set-rpath "$out/lib:${lib.getLib cups}/lib" "$out/lib/libscmssc.so" patchelf --set-rpath "$out/lib:${libxml2.out}/lib:${libusb-compat-0_1.out}/lib" "$out/lib/sane/libsane-smfp.so.1.0.1" ln -s ${stdenv.cc.cc.lib}/lib/libstdc++.so.6 $out/lib/ @@ -102,7 +102,7 @@ in stdenv.mkDerivation rec { # we did this in prefixup already dontPatchELF = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Unified Linux Driver for Samsung printers and scanners"; homepage = "http://www.bchemnet.com/suldr"; downloadPage = "http://www.bchemnet.com/suldr/driver/"; diff --git a/nixpkgs/pkgs/misc/cups/drivers/samsung/1.00.37.nix b/nixpkgs/pkgs/misc/cups/drivers/samsung/1.00.37.nix index c205560706f6..9fb26f62d76d 100644 --- a/nixpkgs/pkgs/misc/cups/drivers/samsung/1.00.37.nix +++ b/nixpkgs/pkgs/misc/cups/drivers/samsung/1.00.37.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cups, libusb-compat-0_1, libxml2 }: +{ lib, stdenv, fetchurl, cups, libusb-compat-0_1, libxml2 }: let @@ -70,10 +70,10 @@ in stdenv.mkDerivation rec { preFixup = '' for bin in "$out/bin/"*; do patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$bin" - patchelf --set-rpath "$out/lib:${stdenv.lib.getLib cups}/lib" "$bin" + patchelf --set-rpath "$out/lib:${lib.getLib cups}/lib" "$bin" done - patchelf --set-rpath "$out/lib:${stdenv.lib.getLib cups}/lib" "$out/lib/libscmssc.so" + patchelf --set-rpath "$out/lib:${lib.getLib cups}/lib" "$out/lib/libscmssc.so" patchelf --set-rpath "$out/lib:${libxml2.out}/lib:${libusb-compat-0_1.out}/lib" "$out/lib/sane/libsane-smfp.so.1.0.1" ln -s ${stdenv.cc.cc.lib}/lib/libstdc++.so.6 $out/lib/ @@ -85,7 +85,7 @@ in stdenv.mkDerivation rec { # we did this in prefixup already dontPatchELF = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Unified Linux Driver for Samsung printers and scanners"; homepage = "http://www.bchemnet.com/suldr"; downloadPage = "http://www.bchemnet.com/suldr/driver/"; diff --git a/nixpkgs/pkgs/misc/cups/drivers/samsung/4.00.39/default.nix b/nixpkgs/pkgs/misc/cups/drivers/samsung/4.00.39/default.nix index c3c3613bbda8..92f5fdc409c4 100644 --- a/nixpkgs/pkgs/misc/cups/drivers/samsung/4.00.39/default.nix +++ b/nixpkgs/pkgs/misc/cups/drivers/samsung/4.00.39/default.nix @@ -11,12 +11,12 @@ # } # (This advice was tested on 2010 August 2.) -{ stdenv, fetchurl, cups, gcc, ghostscript, glibc, patchelf }: +{ lib, stdenv, fetchurl, cups, gcc, ghostscript, glibc, patchelf }: # Do not bump lightly! Visit <http://www.bchemnet.com/suldr/supported.html> # to see what will break when upgrading. Consider a new versioned attribute. let - cups' = stdenv.lib.getLib cups; + cups' = lib.getLib cups; in stdenv.mkDerivation rec { pname = "samsung-UnifiedLinuxDriver"; version = "4.00.39"; @@ -34,7 +34,7 @@ in stdenv.mkDerivation rec { builder = ./builder.sh; - meta = with stdenv.lib; { + meta = with lib; { description = "Samsung's Linux printing drivers; includes binaries without source code"; homepage = "http://www.samsung.com/"; license = licenses.unfree; diff --git a/nixpkgs/pkgs/misc/cups/drivers/samsung/4.01.17.nix b/nixpkgs/pkgs/misc/cups/drivers/samsung/4.01.17.nix index 5de93b20cb80..2591cf735661 100644 --- a/nixpkgs/pkgs/misc/cups/drivers/samsung/4.01.17.nix +++ b/nixpkgs/pkgs/misc/cups/drivers/samsung/4.01.17.nix @@ -11,14 +11,14 @@ # } # (This advice was tested on the 1st November 2016.) -{ stdenv, fetchurl, cups, libusb-compat-0_1 }: +{ lib, stdenv, fetchurl, cups, libusb-compat-0_1 }: # Do not bump lightly! Visit <http://www.bchemnet.com/suldr/supported.html> # to see what will break when upgrading. Consider a new versioned attribute. let installationPath = if stdenv.hostPlatform.system == "x86_64-linux" then "x86_64" else "i386"; appendPath = if stdenv.hostPlatform.system == "x86_64-linux" then "64" else ""; - libPath = stdenv.lib.makeLibraryPath [ cups libusb-compat-0_1 ] + ":$out/lib:${stdenv.cc.cc.lib}/lib${appendPath}"; + libPath = lib.makeLibraryPath [ cups libusb-compat-0_1 ] + ":$out/lib:${stdenv.cc.cc.lib}/lib${appendPath}"; in stdenv.mkDerivation rec { pname = "samsung-UnifiedLinuxDriver"; version = "4.01.17"; @@ -72,7 +72,7 @@ in stdenv.mkDerivation rec { cp -r ./* $out/share/cups/model/samsung ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Samsung's Linux printing drivers; includes binaries without source code"; homepage = "http://www.samsung.com/"; license = licenses.unfree; |