From 929ad8e99662d9ff6f08a5646ecc66e5c7df1bfc Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 3 Oct 2018 10:21:41 +0200 Subject: [PATCH] samsung-unified-linux-driver: update default version to 4.01.17 * Version 4.01.17 works fine for me on NixOS, driving both a Samsung ML-2165w and a Samsung ML-2510 printer successfully. * Version 4.00.39 is broken. The build shows errors, but doesn't abort. The generated binaries don't work, because they are lacking rpaths to their library dependencies. * Renamed old default.nix file to 1.00.37.nix. That version wasn't the default and it feels like a bad idea to mix versioned and unversioned file names in the same directory. --- pkgs/misc/cups/drivers/samsung/{default.nix => 1.00.37.nix} | 0 pkgs/misc/cups/drivers/samsung/4.00.39/default.nix | 1 + pkgs/top-level/all-packages.nix | 5 +++-- 3 files changed, 4 insertions(+), 2 deletions(-) rename pkgs/misc/cups/drivers/samsung/{default.nix => 1.00.37.nix} (100%) diff --git a/pkgs/misc/cups/drivers/samsung/default.nix b/pkgs/misc/cups/drivers/samsung/1.00.37.nix similarity index 100% rename from pkgs/misc/cups/drivers/samsung/default.nix rename to pkgs/misc/cups/drivers/samsung/1.00.37.nix diff --git a/pkgs/misc/cups/drivers/samsung/4.00.39/default.nix b/pkgs/misc/cups/drivers/samsung/4.00.39/default.nix index 35b0ba3684f..df0a270a5b2 100644 --- a/pkgs/misc/cups/drivers/samsung/4.00.39/default.nix +++ b/pkgs/misc/cups/drivers/samsung/4.00.39/default.nix @@ -39,5 +39,6 @@ in stdenv.mkDerivation rec { homepage = http://www.samsung.com/; license = licenses.unfree; platforms = platforms.linux; + broken = true; # libscmssc.so and libmfp.so can't find their library dependencies at run-time }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a824858be91..f837da8e58c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22066,9 +22066,10 @@ with pkgs; mfcl8690cdwcupswrapper = callPackage ../misc/cups/drivers/mfcl8690cdwcupswrapper { }; mfcl8690cdwlpr = callPackage ../misc/cups/drivers/mfcl8690cdwlpr { }; - samsung-unified-linux-driver_1_00_37 = callPackage ../misc/cups/drivers/samsung { }; + samsung-unified-linux-driver_1_00_37 = callPackage ../misc/cups/drivers/samsung/1.00.37.nix { }; + samsung-unified-linux-driver_4_00_39 = callPackage ../misc/cups/drivers/samsung/4.00.39 { }; samsung-unified-linux-driver_4_01_17 = callPackage ../misc/cups/drivers/samsung/4.01.17.nix { }; - samsung-unified-linux-driver = callPackage ../misc/cups/drivers/samsung/4.00.39 { }; + samsung-unified-linux-driver = self.samsung-unified-linux-driver_4_01_17; sane-backends = callPackage ../applications/graphics/sane/backends { gt68xxFirmware = config.sane.gt68xxFirmware or null;