From 3948577e2aa7e4ea642543e32157786758e7f997 Mon Sep 17 00:00:00 2001 From: Yarny0 <41838844+Yarny0@users.noreply.github.com> Date: Mon, 10 Mar 2025 15:39:22 +0100 Subject: [PATCH 1/4] samsung-unified-linux-driver (all): use `finalAttrs` pattern --- .../sa/samsung-unified-linux-driver_1_00_36/package.nix | 6 +++--- pkgs/misc/cups/drivers/samsung/1.00.37.nix | 6 +++--- pkgs/misc/cups/drivers/samsung/4.01.17.nix | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/sa/samsung-unified-linux-driver_1_00_36/package.nix b/pkgs/by-name/sa/samsung-unified-linux-driver_1_00_36/package.nix index 1e9b34579ba6..7afc96ee7cef 100644 --- a/pkgs/by-name/sa/samsung-unified-linux-driver_1_00_36/package.nix +++ b/pkgs/by-name/sa/samsung-unified-linux-driver_1_00_36/package.nix @@ -13,13 +13,13 @@ let arch = if stdenv.system == "x86_64-linux" then "x86_64" else "i386"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "samsung-unified-linux-driver"; version = "1.00.36"; src = fetchurl { sha256 = "1a7ngd03x0bkdl7pszy5zqqic0plxvdxqm5w7klr6hbdskx1lir9"; - url = "http://www.bchemnet.com/suldr/driver/UnifiedLinuxDriver-${version}.tar.gz"; + url = "http://www.bchemnet.com/suldr/driver/UnifiedLinuxDriver-${finalAttrs.version}.tar.gz"; }; buildInputs = [ @@ -124,4 +124,4 @@ stdenv.mkDerivation rec { platforms = platforms.linux; maintainers = [ ]; }; -} +}) diff --git a/pkgs/misc/cups/drivers/samsung/1.00.37.nix b/pkgs/misc/cups/drivers/samsung/1.00.37.nix index 4d0bb0e96a24..fbf0501eff2c 100644 --- a/pkgs/misc/cups/drivers/samsung/1.00.37.nix +++ b/pkgs/misc/cups/drivers/samsung/1.00.37.nix @@ -12,13 +12,13 @@ let arch = if stdenv.hostPlatform.system == "x86_64-linux" then "x86_64" else "i386"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "samsung-unified-linux-driver"; version = "1.00.37"; src = fetchurl { sha256 = "0r66l9zp0p1qgakh4j08hynwsr4lsgq5yrpxyr0x4ldvl0z2b1bb"; - url = "http://www.bchemnet.com/suldr/driver/UnifiedLinuxDriver-${version}.tar.gz"; + url = "http://www.bchemnet.com/suldr/driver/UnifiedLinuxDriver-${finalAttrs.version}.tar.gz"; }; buildInputs = [ @@ -105,4 +105,4 @@ stdenv.mkDerivation rec { # Probably won't work on anything else. platforms = platforms.linux; }; -} +}) diff --git a/pkgs/misc/cups/drivers/samsung/4.01.17.nix b/pkgs/misc/cups/drivers/samsung/4.01.17.nix index 05bf9c263d15..ea768cf8d9b9 100644 --- a/pkgs/misc/cups/drivers/samsung/4.01.17.nix +++ b/pkgs/misc/cups/drivers/samsung/4.01.17.nix @@ -32,12 +32,12 @@ let ] + ":$out/lib:${lib.getLib stdenv.cc.cc}/lib${appendPath}"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "samsung-UnifiedLinuxDriver"; version = "4.01.17"; src = fetchurl { - url = "http://www.bchemnet.com/suldr/driver/UnifiedLinuxDriver-${version}.tar.gz"; + url = "http://www.bchemnet.com/suldr/driver/UnifiedLinuxDriver-${finalAttrs.version}.tar.gz"; sha256 = "1vv3pzvqpg1dq3xjr8161x2yp3v7ca75vil56ranhw5pkjwq66x0"; }; @@ -100,4 +100,4 @@ stdenv.mkDerivation rec { platforms = platforms.linux; maintainers = with maintainers; [ joko ]; }; -} +}) From fea4433fb57db29a867e96b536b8d405289f0843 Mon Sep 17 00:00:00 2001 From: Yarny0 <41838844+Yarny0@users.noreply.github.com> Date: Mon, 10 Mar 2025 15:46:00 +0100 Subject: [PATCH 2/4] samsung-unified-linux-driver (all): resolve `with lib;` in `meta` https://github.com/NixOS/nixpkgs/issues/371862 --- .../samsung-unified-linux-driver_1_00_36/package.nix | 8 ++++---- pkgs/misc/cups/drivers/samsung/1.00.37.nix | 8 ++++---- pkgs/misc/cups/drivers/samsung/4.01.17.nix | 10 +++++----- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/pkgs/by-name/sa/samsung-unified-linux-driver_1_00_36/package.nix b/pkgs/by-name/sa/samsung-unified-linux-driver_1_00_36/package.nix index 7afc96ee7cef..e45dfa5cc1b9 100644 --- a/pkgs/by-name/sa/samsung-unified-linux-driver_1_00_36/package.nix +++ b/pkgs/by-name/sa/samsung-unified-linux-driver_1_00_36/package.nix @@ -112,16 +112,16 @@ stdenv.mkDerivation (finalAttrs: { # we did this in prefixup already dontPatchELF = true; - meta = with lib; { + meta = { description = "Unified Linux Driver for Samsung printers and scanners"; homepage = "http://www.bchemnet.com/suldr"; downloadPage = "http://www.bchemnet.com/suldr/driver/"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.unfree; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + license = lib.licenses.unfree; # Tested on linux-x86_64. Might work on linux-i386. # Probably won't work on anything else. - platforms = platforms.linux; + platforms = lib.platforms.linux; maintainers = [ ]; }; }) diff --git a/pkgs/misc/cups/drivers/samsung/1.00.37.nix b/pkgs/misc/cups/drivers/samsung/1.00.37.nix index fbf0501eff2c..18461b8436c1 100644 --- a/pkgs/misc/cups/drivers/samsung/1.00.37.nix +++ b/pkgs/misc/cups/drivers/samsung/1.00.37.nix @@ -94,15 +94,15 @@ stdenv.mkDerivation (finalAttrs: { # we did this in prefixup already dontPatchELF = true; - meta = with lib; { + meta = { description = "Unified Linux Driver for Samsung printers and scanners"; homepage = "http://www.bchemnet.com/suldr"; downloadPage = "http://www.bchemnet.com/suldr/driver/"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.unfree; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + license = lib.licenses.unfree; # Tested on linux-x86_64. Might work on linux-i386. # Probably won't work on anything else. - platforms = platforms.linux; + platforms = lib.platforms.linux; }; }) diff --git a/pkgs/misc/cups/drivers/samsung/4.01.17.nix b/pkgs/misc/cups/drivers/samsung/4.01.17.nix index ea768cf8d9b9..47ab13fecbe4 100644 --- a/pkgs/misc/cups/drivers/samsung/4.01.17.nix +++ b/pkgs/misc/cups/drivers/samsung/4.01.17.nix @@ -92,12 +92,12 @@ stdenv.mkDerivation (finalAttrs: { "rastertospl" ]; - meta = with lib; { + meta = { description = "Samsung's Linux printing drivers; includes binaries without source code"; homepage = "http://www.samsung.com/"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.unfree; - platforms = platforms.linux; - maintainers = with maintainers; [ joko ]; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + license = lib.licenses.unfree; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ joko ]; }; }) From 0b59ddc82dd9c427128fd7dc94f125dfa7a381a6 Mon Sep 17 00:00:00 2001 From: Yarny0 <41838844+Yarny0@users.noreply.github.com> Date: Mon, 10 Mar 2025 15:47:19 +0100 Subject: [PATCH 3/4] samsung-unified-linux-driver 4.01.17: unify derivation name Change the name of the derivation in `pkgs/misc/cups/drivers/samsung/4.01.17.nix` from "samsung-UnifiedLinuxDriver" to "samsung-unified-linux-driver", so that it matches the names of the other versions declared in `pkgs/misc/cups/drivers/samsung/1.00.37.nix` and in `pkgs/by-name/sa/samsung-unified-linux-driver_1_00_36/package.nix`. --- pkgs/misc/cups/drivers/samsung/4.01.17.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/misc/cups/drivers/samsung/4.01.17.nix b/pkgs/misc/cups/drivers/samsung/4.01.17.nix index 47ab13fecbe4..77e83c32aa69 100644 --- a/pkgs/misc/cups/drivers/samsung/4.01.17.nix +++ b/pkgs/misc/cups/drivers/samsung/4.01.17.nix @@ -33,7 +33,7 @@ let + ":$out/lib:${lib.getLib stdenv.cc.cc}/lib${appendPath}"; in stdenv.mkDerivation (finalAttrs: { - pname = "samsung-UnifiedLinuxDriver"; + pname = "samsung-unified-linux-driver"; version = "4.01.17"; src = fetchurl { From eb8cee29f97ef3fc22f4f30b30e63a5f33f2498a Mon Sep 17 00:00:00 2001 From: Yarny0 <41838844+Yarny0@users.noreply.github.com> Date: Mon, 10 Mar 2025 15:48:39 +0100 Subject: [PATCH 4/4] samsung-unified-linux-driver 4.01.17: fix library path On x86-64, the executables were looking for libraries in `${lib.getLib stdenv.cc.cc}/lib64`, but that path apparently changed with https://github.com/NixOS/nixpkgs/commit/5e2e98f3b71f1b7e0168e5c071bc9dff029287cb , resulting in a runtime error: > /nix/store/0z8gd4fmjknwswx0pp5kzqnrhj1k9q8x-samsung-UnifiedLinuxDriver-4.01.17/lib/cups/filter/rastertospl: error while loading shared libraries: libstdc++.so.6: cannot open shared object file: No such file or directory Affected programs are `$out/lib/cups/filter/{ps,raster}tospl{,c}`. The commit at hand fixes the library lookup path. --- pkgs/misc/cups/drivers/samsung/4.01.17.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/misc/cups/drivers/samsung/4.01.17.nix b/pkgs/misc/cups/drivers/samsung/4.01.17.nix index 77e83c32aa69..c4ddc3a98f8c 100644 --- a/pkgs/misc/cups/drivers/samsung/4.01.17.nix +++ b/pkgs/misc/cups/drivers/samsung/4.01.17.nix @@ -30,7 +30,7 @@ let cups libusb-compat-0_1 ] - + ":$out/lib:${lib.getLib stdenv.cc.cc}/lib${appendPath}"; + + ":$out/lib:${lib.getLib stdenv.cc.cc}/lib"; in stdenv.mkDerivation (finalAttrs: { pname = "samsung-unified-linux-driver";