lib{ice,sm,xt,xmu,xpm,xaw}: refactor, move to pkgs/by-name and rename from xorg namespace (#434790)

authored by jopejoe1 and committed by GitHub 9d9f6b3d 5c34cea5

+472 -329
+55
pkgs/by-name/li/libice/package.nix
··· 1 + { 2 + lib, 3 + stdenv, 4 + fetchurl, 5 + pkg-config, 6 + xorgproto, 7 + xtrans, 8 + writeScript, 9 + testers, 10 + }: 11 + stdenv.mkDerivation (finalAttrs: { 12 + pname = "libice"; 13 + version = "1.1.2"; 14 + 15 + outputs = [ 16 + "out" 17 + "dev" 18 + "doc" 19 + ]; 20 + 21 + src = fetchurl { 22 + url = "mirror://xorg/individual/lib/libICE-${finalAttrs.version}.tar.xz"; 23 + hash = "sha256-l05O1BQiXrPHFphd+XCfTajSKmeiiQBmvG38ia0phiU="; 24 + }; 25 + 26 + strictDeps = true; 27 + 28 + nativeBuildInputs = [ pkg-config ]; 29 + 30 + buildInputs = [ 31 + xorgproto 32 + xtrans 33 + ]; 34 + 35 + passthru = { 36 + updateScript = writeScript "update-${finalAttrs.pname}" '' 37 + #!/usr/bin/env nix-shell 38 + #!nix-shell -i bash -p common-updater-scripts 39 + version="$(list-directory-versions --pname libICE \ 40 + --url https://xorg.freedesktop.org/releases/individual/lib/ \ 41 + | sort -V | tail -n1)" 42 + update-source-version ${finalAttrs.pname} "$version" 43 + ''; 44 + tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; 45 + }; 46 + 47 + meta = { 48 + description = "Inter-Client Exchange Library"; 49 + homepage = "https://gitlab.freedesktop.org/xorg/lib/libice"; 50 + license = lib.licenses.mitOpenGroup; 51 + maintainers = [ ]; 52 + pkgConfigModules = [ "ice" ]; 53 + platforms = lib.platforms.unix; 54 + }; 55 + })
+67
pkgs/by-name/li/libsm/package.nix
··· 1 + { 2 + lib, 3 + stdenv, 4 + fetchurl, 5 + pkg-config, 6 + libice, 7 + libuuid, 8 + xorgproto, 9 + xtrans, 10 + writeScript, 11 + testers, 12 + }: 13 + stdenv.mkDerivation (finalAttrs: { 14 + pname = "libsm"; 15 + version = "1.2.6"; 16 + 17 + outputs = [ 18 + "out" 19 + "dev" 20 + "doc" 21 + ]; 22 + 23 + src = fetchurl { 24 + url = "mirror://xorg/individual/lib/libSM-${finalAttrs.version}.tar.xz"; 25 + hash = "sha256-vnwKvbFcv9KaxiVzwcguh3+dQEetFTIefql9HkPYNb4="; 26 + }; 27 + 28 + strictDeps = true; 29 + 30 + nativeBuildInputs = [ pkg-config ]; 31 + 32 + buildInputs = [ 33 + libice 34 + libuuid 35 + xorgproto 36 + xtrans 37 + ]; 38 + 39 + propagatedBuildInputs = [ 40 + # needs to be propagated because of header file dependencies 41 + libice 42 + ]; 43 + 44 + passthru = { 45 + updateScript = writeScript "update-${finalAttrs.pname}" '' 46 + #!/usr/bin/env nix-shell 47 + #!nix-shell -i bash -p common-updater-scripts 48 + version="$(list-directory-versions --pname libSM \ 49 + --url https://xorg.freedesktop.org/releases/individual/lib/ \ 50 + | sort -V | tail -n1)" 51 + update-source-version ${finalAttrs.pname} "$version" 52 + ''; 53 + tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; 54 + }; 55 + 56 + meta = { 57 + description = "X Session Management Library"; 58 + homepage = "https://gitlab.freedesktop.org/xorg/lib/libsm"; 59 + license = with lib.licenses; [ 60 + mit 61 + mitOpenGroup 62 + ]; 63 + maintainers = [ ]; 64 + pkgConfigModules = [ "sm" ]; 65 + platforms = lib.platforms.unix; 66 + }; 67 + })
+82
pkgs/by-name/li/libxaw/package.nix
··· 1 + { 2 + lib, 3 + stdenv, 4 + fetchurl, 5 + pkg-config, 6 + xorgproto, 7 + libx11, 8 + libxext, 9 + libxmu, 10 + libxpm, 11 + libxt, 12 + writeScript, 13 + testers, 14 + }: 15 + stdenv.mkDerivation (finalAttrs: { 16 + pname = "libxaw"; 17 + version = "1.0.16"; 18 + 19 + outputs = [ 20 + "out" 21 + "dev" 22 + "devdoc" 23 + ]; 24 + 25 + src = fetchurl { 26 + url = "mirror://xorg/individual/lib/libXaw-${finalAttrs.version}.tar.xz"; 27 + hash = "sha256-cx1XK1THCPgeGXpq+oAWkY4uBt/TAl4GbKZCpbjDnI8="; 28 + }; 29 + 30 + strictDeps = true; 31 + 32 + nativeBuildInputs = [ pkg-config ]; 33 + 34 + buildInputs = [ 35 + xorgproto 36 + libx11 37 + libxext 38 + libxmu 39 + libxpm 40 + libxt 41 + ]; 42 + 43 + propagatedBuildInputs = [ 44 + xorgproto 45 + libxt 46 + # needs to be propagated because of header file dependencies 47 + libxmu 48 + ]; 49 + 50 + postInstall = 51 + # remove dangling symlinks to .so files on static 52 + lib.optionalString stdenv.hostPlatform.isStatic "rm $out/lib/*.so*"; 53 + 54 + passthru = { 55 + updateScript = writeScript "update-${finalAttrs.pname}" '' 56 + #!/usr/bin/env nix-shell 57 + #!nix-shell -i bash -p common-updater-scripts 58 + version="$(list-directory-versions --pname libXaw \ 59 + --url https://xorg.freedesktop.org/releases/individual/lib/ \ 60 + | sort -V | tail -n1)" 61 + update-source-version ${finalAttrs.pname} "$version" 62 + ''; 63 + tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; 64 + }; 65 + 66 + meta = { 67 + description = "X Athena Widget Set, based on the X Toolkit Intrinsics (Xt) Library"; 68 + homepage = "https://gitlab.freedesktop.org/xorg/lib/libxaw"; 69 + license = with lib.licenses; [ 70 + mitOpenGroup 71 + x11 72 + hpndSellVariant 73 + hpnd 74 + ]; 75 + maintainers = [ ]; 76 + pkgConfigModules = [ 77 + "xaw6" 78 + "xaw7" 79 + ]; 80 + platforms = lib.platforms.unix; 81 + }; 82 + })
+75
pkgs/by-name/li/libxmu/package.nix
··· 1 + { 2 + lib, 3 + stdenv, 4 + fetchurl, 5 + pkg-config, 6 + xorgproto, 7 + libx11, 8 + libxext, 9 + libxt, 10 + writeScript, 11 + testers, 12 + }: 13 + stdenv.mkDerivation (finalAttrs: { 14 + pname = "libxmu"; 15 + version = "1.2.1"; 16 + 17 + outputs = [ 18 + "out" 19 + "dev" 20 + "doc" 21 + ]; 22 + 23 + src = fetchurl { 24 + url = "mirror://xorg/individual/lib/libXmu-${finalAttrs.version}.tar.xz"; 25 + hash = "sha256-/LJ3kySKOeX8xbnErsQMwHNLPKdqrD19HCZOf34U6LI="; 26 + }; 27 + 28 + strictDeps = true; 29 + 30 + nativeBuildInputs = [ pkg-config ]; 31 + 32 + buildInputs = [ 33 + xorgproto 34 + libx11 35 + libxext 36 + libxt 37 + ]; 38 + 39 + propagatedBuildInputs = [ 40 + xorgproto 41 + libx11 42 + libxt 43 + ]; 44 + 45 + buildFlags = [ "BITMAP_DEFINES='-DBITMAPDIR=\"/no-such-path\"'" ]; 46 + 47 + passthru = { 48 + updateScript = writeScript "update-${finalAttrs.pname}" '' 49 + #!/usr/bin/env nix-shell 50 + #!nix-shell -i bash -p common-updater-scripts 51 + version="$(list-directory-versions --pname libXmu \ 52 + --url https://xorg.freedesktop.org/releases/individual/lib/ \ 53 + | sort -V | tail -n1)" 54 + update-source-version ${finalAttrs.pname} "$version" 55 + ''; 56 + tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; 57 + }; 58 + 59 + meta = { 60 + description = "X miscellaneous utility routines library"; 61 + homepage = "https://gitlab.freedesktop.org/xorg/lib/libxmu"; 62 + license = with lib.licenses; [ 63 + mitOpenGroup 64 + hpnd 65 + x11 66 + isc 67 + ]; 68 + maintainers = [ ]; 69 + pkgConfigModules = [ 70 + "xmu" 71 + "xmuu" 72 + ]; 73 + platforms = lib.platforms.unix; 74 + }; 75 + })
+79
pkgs/by-name/li/libxpm/package.nix
··· 1 + { 2 + lib, 3 + stdenv, 4 + fetchurl, 5 + pkg-config, 6 + gettext, 7 + xorgproto, 8 + libx11, 9 + libxext, 10 + libxt, 11 + ncompress, 12 + gzip, 13 + writeScript, 14 + testers, 15 + }: 16 + stdenv.mkDerivation (finalAttrs: { 17 + pname = "libxpm"; 18 + version = "3.5.17"; 19 + 20 + outputs = [ 21 + "bin" 22 + "dev" 23 + "out" 24 + ]; 25 + 26 + src = fetchurl { 27 + url = "mirror://xorg/individual/lib/libXpm-${finalAttrs.version}.tar.xz"; 28 + hash = "sha256-ZLMfgQGefTiMgisLKK+NUcRiK4Px8Mtvo/yV4nEibkM="; 29 + }; 30 + 31 + strictDeps = true; 32 + 33 + nativeBuildInputs = [ 34 + pkg-config 35 + gettext 36 + ]; 37 + 38 + buildInputs = [ 39 + xorgproto 40 + libx11 41 + libxext 42 + libxt 43 + ]; 44 + 45 + propagatedBuildInputs = [ 46 + libx11 47 + ]; 48 + 49 + env = { 50 + XPM_PATH_COMPRESS = lib.makeBinPath [ ncompress ]; 51 + XPM_PATH_GZIP = lib.makeBinPath [ gzip ]; 52 + XPM_PATH_UNCOMPRESS = lib.makeBinPath [ gzip ]; 53 + }; 54 + 55 + passthru = { 56 + updateScript = writeScript "update-${finalAttrs.pname}" '' 57 + #!/usr/bin/env nix-shell 58 + #!nix-shell -i bash -p common-updater-scripts 59 + version="$(list-directory-versions --pname libXpm \ 60 + --url https://xorg.freedesktop.org/releases/individual/lib/ \ 61 + | sort -V | tail -n1)" 62 + update-source-version ${finalAttrs.pname} "$version" 63 + ''; 64 + tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; 65 + }; 66 + 67 + meta = { 68 + description = "X Pixmap (XPM) image file format library"; 69 + homepage = "https://gitlab.freedesktop.org/xorg/lib/libxpm"; 70 + license = with lib.licenses; [ 71 + x11 72 + mit 73 + ]; 74 + mainProgram = "sxpm"; 75 + maintainers = [ ]; 76 + pkgConfigModules = [ "xpm" ]; 77 + platforms = lib.platforms.unix; 78 + }; 79 + })
+82
pkgs/by-name/li/libxt/package.nix
··· 1 + { 2 + lib, 3 + stdenv, 4 + fetchurl, 5 + buildPackages, 6 + pkg-config, 7 + xorgproto, 8 + libx11, 9 + libsm, 10 + writeScript, 11 + testers, 12 + }: 13 + stdenv.mkDerivation (finalAttrs: { 14 + pname = "libxt"; 15 + version = "1.3.1"; 16 + 17 + outputDoc = "devdoc"; 18 + outputs = [ 19 + "out" 20 + "dev" 21 + "devdoc" 22 + ]; 23 + 24 + src = fetchurl { 25 + url = "mirror://xorg/individual/lib/libXt-${finalAttrs.version}.tar.xz"; 26 + hash = "sha256-4Kd0szMk9NTAWxmepFBQ+HIGWG2BZV+L7026Q02TEog="; 27 + }; 28 + 29 + strictDeps = true; 30 + 31 + depsBuildBuild = [ buildPackages.stdenv.cc ]; 32 + 33 + nativeBuildInputs = [ pkg-config ]; 34 + 35 + buildInputs = [ 36 + xorgproto 37 + libx11 38 + libsm 39 + ]; 40 + 41 + propagatedBuildInputs = [ 42 + xorgproto 43 + libx11 44 + # needs to be propagated because of header file dependencies 45 + libsm 46 + ]; 47 + 48 + configureFlags = 49 + lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "--enable-malloc0returnsnull" 50 + ++ lib.optional (stdenv.targetPlatform.useLLVM or false) "ac_cv_path_RAWCPP=cpp"; 51 + 52 + env = { 53 + CPP = if stdenv.hostPlatform.isDarwin then "clang -E -" else "${stdenv.cc.targetPrefix}cc -E -"; 54 + }; 55 + 56 + passthru = { 57 + updateScript = writeScript "update-${finalAttrs.pname}" '' 58 + #!/usr/bin/env nix-shell 59 + #!nix-shell -i bash -p common-updater-scripts 60 + version="$(list-directory-versions --pname libXt \ 61 + --url https://xorg.freedesktop.org/releases/individual/lib/ \ 62 + | sort -V | tail -n1)" 63 + update-source-version ${finalAttrs.pname} "$version" 64 + ''; 65 + tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; 66 + }; 67 + 68 + meta = { 69 + description = "X Toolkit Intrinsics library"; 70 + homepage = "https://gitlab.freedesktop.org/xorg/lib/libxt"; 71 + license = with lib.licenses; [ 72 + mit 73 + hpndSellVariant 74 + hpnd 75 + mitOpenGroup 76 + x11 77 + ]; 78 + maintainers = [ ]; 79 + pkgConfigModules = [ "xt" ]; 80 + platforms = lib.platforms.unix; 81 + }; 82 + })
+12 -248
pkgs/servers/x11/xorg/default.nix
··· 11 11 libdmx, 12 12 libfontenc, 13 13 libfs, 14 + libice, 14 15 libpciaccess, 15 16 libpthread-stubs, 17 + libsm, 16 18 libx11, 17 19 libxau, 20 + libxaw, 18 21 libxcb, 19 22 libxcvt, 20 23 libxcursor, 21 24 libxdmcp, 22 25 libxext, 23 26 libxfixes, 27 + libxmu, 28 + libxpm, 24 29 libxrandr, 25 30 libxrender, 31 + libxt, 26 32 libxv, 27 33 lndir, 28 34 luit, ··· 89 95 fontutil = font-util; 90 96 libAppleWM = libapplewm; 91 97 libFS = libfs; 98 + libICE = libice; 92 99 libpthreadstubs = libpthread-stubs; 100 + libSM = libsm; 93 101 libX11 = libx11; 94 102 libXau = libxau; 103 + libXaw = libxaw; 95 104 libXcursor = libxcursor; 96 105 libXdmcp = libxdmcp; 97 106 libXext = libxext; 98 107 libXfixes = libxfixes; 108 + libXmu = libxmu; 109 + libXpm = libxpm; 99 110 libXrandr = libxrandr; 100 111 libXrender = libxrender; 112 + libXt = libxt; 101 113 libXv = libxv; 102 114 utilmacros = util-macros; 103 115 xcbproto = xcb-proto; ··· 1742 1754 ) { }; 1743 1755 1744 1756 # THIS IS A GENERATED FILE. DO NOT EDIT! 1745 - libICE = callPackage ( 1746 - { 1747 - stdenv, 1748 - pkg-config, 1749 - fetchurl, 1750 - xorgproto, 1751 - xtrans, 1752 - testers, 1753 - }: 1754 - stdenv.mkDerivation (finalAttrs: { 1755 - pname = "libICE"; 1756 - version = "1.1.2"; 1757 - builder = ./builder.sh; 1758 - src = fetchurl { 1759 - url = "mirror://xorg/individual/lib/libICE-1.1.2.tar.xz"; 1760 - sha256 = "09c656nqkz3dpik012d2cwmd5a2dkxqgjpcq2v3v6pi22ka4wklp"; 1761 - }; 1762 - hardeningDisable = [ 1763 - "bindnow" 1764 - "relro" 1765 - ]; 1766 - strictDeps = true; 1767 - nativeBuildInputs = [ pkg-config ]; 1768 - buildInputs = [ 1769 - xorgproto 1770 - xtrans 1771 - ]; 1772 - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; 1773 - meta = { 1774 - pkgConfigModules = [ "ice" ]; 1775 - platforms = lib.platforms.unix; 1776 - }; 1777 - }) 1778 - ) { }; 1779 - 1780 - # THIS IS A GENERATED FILE. DO NOT EDIT! 1781 - libSM = callPackage ( 1782 - { 1783 - stdenv, 1784 - pkg-config, 1785 - fetchurl, 1786 - libICE, 1787 - libuuid, 1788 - xorgproto, 1789 - testers, 1790 - }: 1791 - stdenv.mkDerivation (finalAttrs: { 1792 - pname = "libSM"; 1793 - version = "1.2.6"; 1794 - builder = ./builder.sh; 1795 - src = fetchurl { 1796 - url = "mirror://xorg/individual/lib/libSM-1.2.6.tar.xz"; 1797 - sha256 = "1gimv11iwzd9gqg345dd8x09szw75v4c2wr5qsdd5gswn6yhlz5y"; 1798 - }; 1799 - hardeningDisable = [ 1800 - "bindnow" 1801 - "relro" 1802 - ]; 1803 - strictDeps = true; 1804 - nativeBuildInputs = [ pkg-config ]; 1805 - buildInputs = [ 1806 - libICE 1807 - libuuid 1808 - xorgproto 1809 - ]; 1810 - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; 1811 - meta = { 1812 - pkgConfigModules = [ "sm" ]; 1813 - platforms = lib.platforms.unix; 1814 - }; 1815 - }) 1816 - ) { }; 1817 - 1818 - # THIS IS A GENERATED FILE. DO NOT EDIT! 1819 1757 libWindowsWM = callPackage ( 1820 1758 { 1821 1759 stdenv, ··· 1926 1864 passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; 1927 1865 meta = { 1928 1866 pkgConfigModules = [ "xtrap" ]; 1929 - platforms = lib.platforms.unix; 1930 - }; 1931 - }) 1932 - ) { }; 1933 - 1934 - # THIS IS A GENERATED FILE. DO NOT EDIT! 1935 - libXaw = callPackage ( 1936 - { 1937 - stdenv, 1938 - pkg-config, 1939 - fetchurl, 1940 - libX11, 1941 - libXext, 1942 - xorgproto, 1943 - libXmu, 1944 - libXpm, 1945 - libXt, 1946 - testers, 1947 - }: 1948 - stdenv.mkDerivation (finalAttrs: { 1949 - pname = "libXaw"; 1950 - version = "1.0.16"; 1951 - builder = ./builder.sh; 1952 - src = fetchurl { 1953 - url = "mirror://xorg/individual/lib/libXaw-1.0.16.tar.xz"; 1954 - sha256 = "13wwqfwaahm6dh35w0nkvw32x3li2s0glsks34ggh267ahmmf7bk"; 1955 - }; 1956 - hardeningDisable = [ 1957 - "bindnow" 1958 - "relro" 1959 - ]; 1960 - strictDeps = true; 1961 - nativeBuildInputs = [ pkg-config ]; 1962 - buildInputs = [ 1963 - libX11 1964 - libXext 1965 - xorgproto 1966 - libXmu 1967 - libXpm 1968 - libXt 1969 - ]; 1970 - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; 1971 - meta = { 1972 - pkgConfigModules = [ 1973 - "xaw6" 1974 - "xaw7" 1975 - ]; 1976 1867 platforms = lib.platforms.unix; 1977 1868 }; 1978 1869 }) ··· 2259 2150 ) { }; 2260 2151 2261 2152 # THIS IS A GENERATED FILE. DO NOT EDIT! 2262 - libXmu = callPackage ( 2263 - { 2264 - stdenv, 2265 - pkg-config, 2266 - fetchurl, 2267 - libX11, 2268 - libXext, 2269 - xorgproto, 2270 - libXt, 2271 - testers, 2272 - }: 2273 - stdenv.mkDerivation (finalAttrs: { 2274 - pname = "libXmu"; 2275 - version = "1.2.1"; 2276 - builder = ./builder.sh; 2277 - src = fetchurl { 2278 - url = "mirror://xorg/individual/lib/libXmu-1.2.1.tar.xz"; 2279 - sha256 = "1cp82iz7yki63iykvb3alwy4nwy01k2axi5rqpyfafca4j9pgcpw"; 2280 - }; 2281 - hardeningDisable = [ 2282 - "bindnow" 2283 - "relro" 2284 - ]; 2285 - strictDeps = true; 2286 - nativeBuildInputs = [ pkg-config ]; 2287 - buildInputs = [ 2288 - libX11 2289 - libXext 2290 - xorgproto 2291 - libXt 2292 - ]; 2293 - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; 2294 - meta = { 2295 - pkgConfigModules = [ 2296 - "xmu" 2297 - "xmuu" 2298 - ]; 2299 - platforms = lib.platforms.unix; 2300 - }; 2301 - }) 2302 - ) { }; 2303 - 2304 - # THIS IS A GENERATED FILE. DO NOT EDIT! 2305 2153 libXp = callPackage ( 2306 2154 { 2307 2155 stdenv, ··· 2342 2190 ) { }; 2343 2191 2344 2192 # THIS IS A GENERATED FILE. DO NOT EDIT! 2345 - libXpm = callPackage ( 2346 - { 2347 - stdenv, 2348 - pkg-config, 2349 - fetchurl, 2350 - libX11, 2351 - libXext, 2352 - xorgproto, 2353 - libXt, 2354 - gettext, 2355 - testers, 2356 - }: 2357 - stdenv.mkDerivation (finalAttrs: { 2358 - pname = "libXpm"; 2359 - version = "3.5.17"; 2360 - builder = ./builder.sh; 2361 - src = fetchurl { 2362 - url = "mirror://xorg/individual/lib/libXpm-3.5.17.tar.xz"; 2363 - sha256 = "0hvf49qy55gwldpwpw7ihcmn5i2iinpjh2rbha63hzcy060izcv4"; 2364 - }; 2365 - hardeningDisable = [ 2366 - "bindnow" 2367 - "relro" 2368 - ]; 2369 - strictDeps = true; 2370 - nativeBuildInputs = [ 2371 - pkg-config 2372 - gettext 2373 - ]; 2374 - buildInputs = [ 2375 - libX11 2376 - libXext 2377 - xorgproto 2378 - libXt 2379 - ]; 2380 - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; 2381 - meta = { 2382 - pkgConfigModules = [ "xpm" ]; 2383 - platforms = lib.platforms.unix; 2384 - }; 2385 - }) 2386 - ) { }; 2387 - 2388 - # THIS IS A GENERATED FILE. DO NOT EDIT! 2389 2193 libXpresent = callPackage ( 2390 2194 { 2391 2195 stdenv, ··· 2460 2264 passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; 2461 2265 meta = { 2462 2266 pkgConfigModules = [ "xres" ]; 2463 - platforms = lib.platforms.unix; 2464 - }; 2465 - }) 2466 - ) { }; 2467 - 2468 - # THIS IS A GENERATED FILE. DO NOT EDIT! 2469 - libXt = callPackage ( 2470 - { 2471 - stdenv, 2472 - pkg-config, 2473 - fetchurl, 2474 - libICE, 2475 - xorgproto, 2476 - libSM, 2477 - libX11, 2478 - testers, 2479 - }: 2480 - stdenv.mkDerivation (finalAttrs: { 2481 - pname = "libXt"; 2482 - version = "1.3.1"; 2483 - builder = ./builder.sh; 2484 - src = fetchurl { 2485 - url = "mirror://xorg/individual/lib/libXt-1.3.1.tar.xz"; 2486 - sha256 = "120jjd6l7fjdxy5myrc1dmc0cwpqa18a97hrbg0d9x146frp99z0"; 2487 - }; 2488 - hardeningDisable = [ 2489 - "bindnow" 2490 - "relro" 2491 - ]; 2492 - strictDeps = true; 2493 - nativeBuildInputs = [ pkg-config ]; 2494 - buildInputs = [ 2495 - libICE 2496 - xorgproto 2497 - libSM 2498 - libX11 2499 - ]; 2500 - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; 2501 - meta = { 2502 - pkgConfigModules = [ "xt" ]; 2503 2267 platforms = lib.platforms.unix; 2504 2268 }; 2505 2269 })
+20
pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
··· 39 39 $pcMap{"dmx"} = "libdmx"; 40 40 $pcMap{"fontenc"} = "libfontenc"; 41 41 $pcMap{"fontutil"} = "fontutil"; 42 + $pcMap{"ice"} = "libICE"; 42 43 $pcMap{"libfs"} = "libFS"; 43 44 $pcMap{"pciaccess"} = "libpciaccess"; 44 45 $pcMap{"pthread-stubs"} = "libpthreadstubs"; 46 + $pcMap{"sm"} = "libSM"; 45 47 $pcMap{"x11"} = "libX11"; 46 48 $pcMap{"x11-xcb"} = "libX11"; 47 49 $pcMap{"xau"} = "libXau"; 50 + $pcMap{"xaw6"} = "libXaw"; 51 + $pcMap{"xaw7"} = "libXaw"; 48 52 $pcMap{"xbitmaps"} = "xbitmaps"; 49 53 $pcMap{"xcb-proto"} = "xcbproto"; 50 54 $pcMap{"xcursor"} = "libXcursor"; 51 55 $pcMap{"xdmcp"} = "libXdmcp"; 52 56 $pcMap{"xext"} = "libXext"; 53 57 $pcMap{"xfixes"} = "libXfixes"; 58 + $pcMap{"xmu"} = "libXmu"; 59 + $pcMap{"xmuu"} = "libXmu"; 60 + $pcMap{"xpm"} = "libXpm"; 54 61 $pcMap{"xrandr"} = "libXrandr"; 55 62 $pcMap{"xrender"} = "libXrender"; 63 + $pcMap{"xt"} = "libXt"; 56 64 $pcMap{"xtrans"} = "xtrans"; 57 65 $pcMap{"xv"} = "libXv"; 58 66 $pcMap{"\$PIXMAN"} = "pixman"; ··· 304 312 libdmx, 305 313 libfontenc, 306 314 libfs, 315 + libice, 307 316 libpciaccess, 308 317 libpthread-stubs, 318 + libsm, 309 319 libx11, 310 320 libxau, 321 + libxaw, 311 322 libxcb, 312 323 libxcvt, 313 324 libxcursor, 314 325 libxdmcp, 315 326 libxext, 316 327 libxfixes, 328 + libxmu, 329 + libxpm, 317 330 libxrandr, 318 331 libxrender, 332 + libxt, 319 333 libxv, 320 334 lndir, 321 335 luit, ··· 382 396 fontutil = font-util; 383 397 libAppleWM = libapplewm; 384 398 libFS = libfs; 399 + libICE = libice; 385 400 libpthreadstubs = libpthread-stubs; 401 + libSM = libsm; 386 402 libX11 = libx11; 387 403 libXau = libxau; 404 + libXaw = libxaw; 388 405 libXcursor = libxcursor; 389 406 libXdmcp = libxdmcp; 390 407 libXext = libxext; 391 408 libXfixes = libxfixes; 409 + libXmu = libxmu; 410 + libXpm = libxpm; 392 411 libXrandr = libxrandr; 393 412 libXrender = libxrender; 413 + libXt = libxt; 394 414 libXv = libxv; 395 415 utilmacros = util-macros; 396 416 xcbproto = xcb-proto;
-75
pkgs/servers/x11/xorg/overrides.nix
··· 217 217 }; 218 218 }); 219 219 220 - # Propagate some build inputs because of header file dependencies. 221 - # Note: most of these are in Requires.private, so maybe builder.sh 222 - # should propagate them automatically. 223 - libXt = super.libXt.overrideAttrs (attrs: { 224 - preConfigure = '' 225 - sed 's,^as_dummy.*,as_dummy="\$PATH",' -i configure 226 - ''; 227 - configureFlags = 228 - attrs.configureFlags or [ ] 229 - ++ malloc0ReturnsNullCrossFlag 230 - ++ lib.optional (stdenv.targetPlatform.useLLVM or false) "ac_cv_path_RAWCPP=cpp"; 231 - propagatedBuildInputs = attrs.propagatedBuildInputs or [ ] ++ [ xorg.libSM ]; 232 - depsBuildBuild = [ buildPackages.stdenv.cc ]; 233 - CPP = if stdenv.hostPlatform.isDarwin then "clang -E -" else "${stdenv.cc.targetPrefix}cc -E -"; 234 - outputDoc = "devdoc"; 235 - outputs = [ 236 - "out" 237 - "dev" 238 - "devdoc" 239 - ]; 240 - }); 241 - 242 - libICE = super.libICE.overrideAttrs (attrs: { 243 - outputs = [ 244 - "out" 245 - "dev" 246 - "doc" 247 - ]; 248 - }); 249 - 250 220 libXcomposite = super.libXcomposite.overrideAttrs (attrs: { 251 221 outputs = [ 252 222 "out" ··· 255 225 propagatedBuildInputs = attrs.propagatedBuildInputs or [ ] ++ [ xorg.libXfixes ]; 256 226 }); 257 227 258 - libXaw = super.libXaw.overrideAttrs (attrs: { 259 - outputs = [ 260 - "out" 261 - "dev" 262 - "devdoc" 263 - ]; 264 - propagatedBuildInputs = attrs.propagatedBuildInputs or [ ] ++ [ xorg.libXmu ]; 265 - }); 266 - 267 228 libXdamage = super.libXdamage.overrideAttrs (attrs: { 268 229 outputs = [ 269 230 "out" ··· 318 279 configureFlags = attrs.configureFlags or [ ] ++ malloc0ReturnsNullCrossFlag; 319 280 }); 320 281 321 - libXmu = super.libXmu.overrideAttrs (attrs: { 322 - outputs = [ 323 - "out" 324 - "dev" 325 - "doc" 326 - ]; 327 - buildFlags = [ "BITMAP_DEFINES='-DBITMAPDIR=\"/no-such-path\"'" ]; 328 - }); 329 - 330 - libSM = super.libSM.overrideAttrs (attrs: { 331 - outputs = [ 332 - "out" 333 - "dev" 334 - "doc" 335 - ]; 336 - propagatedBuildInputs = attrs.propagatedBuildInputs or [ ] ++ [ 337 - xorg.libICE 338 - xorg.xtrans 339 - ]; 340 - }); 341 - 342 282 libXres = super.libXres.overrideAttrs (attrs: { 343 283 outputs = [ 344 284 "out" ··· 369 309 "out" 370 310 "dev" 371 311 ]; 372 - }); 373 - 374 - libXpm = super.libXpm.overrideAttrs (attrs: { 375 - outputs = [ 376 - "bin" 377 - "dev" 378 - "out" 379 - ]; # tiny man in $bin 380 - patchPhase = "sed -i '/USE_GETTEXT_TRUE/d' sxpm/Makefile.in cxpm/Makefile.in"; 381 - XPM_PATH_COMPRESS = lib.makeBinPath [ ncompress ]; 382 - XPM_PATH_GZIP = lib.makeBinPath [ gzip ]; 383 - XPM_PATH_UNCOMPRESS = lib.makeBinPath [ gzip ]; 384 - meta = attrs.meta // { 385 - mainProgram = "sxpm"; 386 - }; 387 312 }); 388 313 389 314 libXpresent = super.libXpresent.overrideAttrs (attrs: {
-6
pkgs/servers/x11/xorg/tarballs.list
··· 141 141 mirror://xorg/individual/font/font-sun-misc-1.0.4.tar.xz 142 142 mirror://xorg/individual/font/font-winitzki-cyrillic-1.0.4.tar.xz 143 143 mirror://xorg/individual/font/font-xfree86-type1-1.0.5.tar.xz 144 - mirror://xorg/individual/lib/libICE-1.1.2.tar.xz 145 - mirror://xorg/individual/lib/libSM-1.2.6.tar.xz 146 144 mirror://xorg/individual/lib/libWindowsWM-1.0.1.tar.bz2 147 - mirror://xorg/individual/lib/libXaw-1.0.16.tar.xz 148 145 mirror://xorg/individual/lib/libXcomposite-0.4.6.tar.xz 149 146 mirror://xorg/individual/lib/libXdamage-1.1.6.tar.xz 150 147 mirror://xorg/individual/lib/libXfont-1.5.4.tar.bz2 ··· 153 150 mirror://xorg/individual/lib/libXi-1.8.2.tar.xz 154 151 mirror://xorg/individual/lib/libXinerama-1.1.5.tar.xz 155 152 mirror://xorg/individual/lib/libxkbfile-1.1.3.tar.xz 156 - mirror://xorg/individual/lib/libXmu-1.2.1.tar.xz 157 153 mirror://xorg/individual/lib/libXp-1.0.4.tar.xz 158 - mirror://xorg/individual/lib/libXpm-3.5.17.tar.xz 159 154 mirror://xorg/individual/lib/libXpresent-1.0.1.tar.xz 160 155 mirror://xorg/individual/lib/libXres-1.2.2.tar.xz 161 156 mirror://xorg/individual/lib/libXScrnSaver-1.2.4.tar.xz 162 157 mirror://xorg/individual/lib/libxshmfence-1.3.3.tar.xz 163 158 mirror://xorg/individual/lib/libXTrap-1.0.1.tar.bz2 164 - mirror://xorg/individual/lib/libXt-1.3.1.tar.xz 165 159 mirror://xorg/individual/lib/libXtst-1.2.5.tar.xz 166 160 mirror://xorg/individual/lib/libXvMC-1.0.14.tar.xz 167 161 mirror://xorg/individual/lib/libXxf86dga-1.1.6.tar.xz