Skip to content

Commit 9203d9e

Browse files
[staging-next] samsung-unified-linux-driver: fix library path, with lib;, finalAttrs (#388732)
2 parents b38edf3 + eb8cee2 commit 9203d9e

File tree

3 files changed

+24
-24
lines changed

3 files changed

+24
-24
lines changed

pkgs/by-name/sa/samsung-unified-linux-driver_1_00_36/package.nix

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@ let
1313
arch = if stdenv.system == "x86_64-linux" then "x86_64" else "i386";
1414

1515
in
16-
stdenv.mkDerivation rec {
16+
stdenv.mkDerivation (finalAttrs: {
1717
pname = "samsung-unified-linux-driver";
1818
version = "1.00.36";
1919

2020
src = fetchurl {
2121
sha256 = "1a7ngd03x0bkdl7pszy5zqqic0plxvdxqm5w7klr6hbdskx1lir9";
22-
url = "http://www.bchemnet.com/suldr/driver/UnifiedLinuxDriver-${version}.tar.gz";
22+
url = "http://www.bchemnet.com/suldr/driver/UnifiedLinuxDriver-${finalAttrs.version}.tar.gz";
2323
};
2424

2525
buildInputs = [
@@ -112,16 +112,16 @@ stdenv.mkDerivation rec {
112112
# we did this in prefixup already
113113
dontPatchELF = true;
114114

115-
meta = with lib; {
115+
meta = {
116116
description = "Unified Linux Driver for Samsung printers and scanners";
117117
homepage = "http://www.bchemnet.com/suldr";
118118
downloadPage = "http://www.bchemnet.com/suldr/driver/";
119-
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
120-
license = licenses.unfree;
119+
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
120+
license = lib.licenses.unfree;
121121

122122
# Tested on linux-x86_64. Might work on linux-i386.
123123
# Probably won't work on anything else.
124-
platforms = platforms.linux;
124+
platforms = lib.platforms.linux;
125125
maintainers = [ ];
126126
};
127-
}
127+
})

pkgs/misc/cups/drivers/samsung/1.00.37.nix

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ let
1212
arch = if stdenv.hostPlatform.system == "x86_64-linux" then "x86_64" else "i386";
1313

1414
in
15-
stdenv.mkDerivation rec {
15+
stdenv.mkDerivation (finalAttrs: {
1616
pname = "samsung-unified-linux-driver";
1717
version = "1.00.37";
1818

1919
src = fetchurl {
2020
sha256 = "0r66l9zp0p1qgakh4j08hynwsr4lsgq5yrpxyr0x4ldvl0z2b1bb";
21-
url = "http://www.bchemnet.com/suldr/driver/UnifiedLinuxDriver-${version}.tar.gz";
21+
url = "http://www.bchemnet.com/suldr/driver/UnifiedLinuxDriver-${finalAttrs.version}.tar.gz";
2222
};
2323

2424
buildInputs = [
@@ -94,15 +94,15 @@ stdenv.mkDerivation rec {
9494
# we did this in prefixup already
9595
dontPatchELF = true;
9696

97-
meta = with lib; {
97+
meta = {
9898
description = "Unified Linux Driver for Samsung printers and scanners";
9999
homepage = "http://www.bchemnet.com/suldr";
100100
downloadPage = "http://www.bchemnet.com/suldr/driver/";
101-
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
102-
license = licenses.unfree;
101+
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
102+
license = lib.licenses.unfree;
103103

104104
# Tested on linux-x86_64. Might work on linux-i386.
105105
# Probably won't work on anything else.
106-
platforms = platforms.linux;
106+
platforms = lib.platforms.linux;
107107
};
108-
}
108+
})

pkgs/misc/cups/drivers/samsung/4.01.17.nix

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,14 @@ let
3030
cups
3131
libusb-compat-0_1
3232
]
33-
+ ":$out/lib:${lib.getLib stdenv.cc.cc}/lib${appendPath}";
33+
+ ":$out/lib:${lib.getLib stdenv.cc.cc}/lib";
3434
in
35-
stdenv.mkDerivation rec {
36-
pname = "samsung-UnifiedLinuxDriver";
35+
stdenv.mkDerivation (finalAttrs: {
36+
pname = "samsung-unified-linux-driver";
3737
version = "4.01.17";
3838

3939
src = fetchurl {
40-
url = "http://www.bchemnet.com/suldr/driver/UnifiedLinuxDriver-${version}.tar.gz";
40+
url = "http://www.bchemnet.com/suldr/driver/UnifiedLinuxDriver-${finalAttrs.version}.tar.gz";
4141
sha256 = "1vv3pzvqpg1dq3xjr8161x2yp3v7ca75vil56ranhw5pkjwq66x0";
4242
};
4343

@@ -92,12 +92,12 @@ stdenv.mkDerivation rec {
9292
"rastertospl"
9393
];
9494

95-
meta = with lib; {
95+
meta = {
9696
description = "Samsung's Linux printing drivers; includes binaries without source code";
9797
homepage = "http://www.samsung.com/";
98-
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
99-
license = licenses.unfree;
100-
platforms = platforms.linux;
101-
maintainers = with maintainers; [ joko ];
98+
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
99+
license = lib.licenses.unfree;
100+
platforms = lib.platforms.linux;
101+
maintainers = with lib.maintainers; [ joko ];
102102
};
103-
}
103+
})

0 commit comments

Comments
 (0)