diff options
author | Alyssa Ross <hi@alyssa.is> | 2019-09-11 15:24:55 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2019-09-16 22:14:45 +0000 |
commit | 89c4dccbd5f33f71808d4b1baafe619696af1162 (patch) | |
tree | fb1b8d3a2f171164a05d404ab2340cfb1a9d3e21 /nixpkgs/pkgs/desktops/deepin | |
parent | 8920a0e4d962a919238bab69ddc607d7f3396f70 (diff) | |
parent | e19054ab3cd5b7cc9a01d0efc71c8fe310541065 (diff) | |
download | nixlib-89c4dccbd5f33f71808d4b1baafe619696af1162.tar nixlib-89c4dccbd5f33f71808d4b1baafe619696af1162.tar.gz nixlib-89c4dccbd5f33f71808d4b1baafe619696af1162.tar.bz2 nixlib-89c4dccbd5f33f71808d4b1baafe619696af1162.tar.lz nixlib-89c4dccbd5f33f71808d4b1baafe619696af1162.tar.xz nixlib-89c4dccbd5f33f71808d4b1baafe619696af1162.tar.zst nixlib-89c4dccbd5f33f71808d4b1baafe619696af1162.zip |
Merge commit 'e19054ab3cd5b7cc9a01d0efc71c8fe310541065'
Diffstat (limited to 'nixpkgs/pkgs/desktops/deepin')
11 files changed, 12 insertions, 12 deletions
diff --git a/nixpkgs/pkgs/desktops/deepin/dbus-factory/default.nix b/nixpkgs/pkgs/desktops/deepin/dbus-factory/default.nix index 3a0695f3fb84..2511f05c4ea3 100644 --- a/nixpkgs/pkgs/desktops/deepin/dbus-factory/default.nix +++ b/nixpkgs/pkgs/desktops/deepin/dbus-factory/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { go-dbus-generator ]; - makeFlags = [ "GOPATH=${placeholder ''out''}/share/go" ]; + makeFlags = [ "GOPATH=${placeholder "out"}/share/go" ]; postPatch = '' sed -i -e 's:/share/gocode:/share/go:' Makefile diff --git a/nixpkgs/pkgs/desktops/deepin/deepin-anything/default.nix b/nixpkgs/pkgs/desktops/deepin/deepin-anything/default.nix index 619c66d9f5f8..7c88102c5f3a 100644 --- a/nixpkgs/pkgs/desktops/deepin/deepin-anything/default.nix +++ b/nixpkgs/pkgs/desktops/deepin/deepin-anything/default.nix @@ -30,7 +30,7 @@ mkDerivation rec { makeFlags = [ "DEB_HOST_MULTIARCH=" - "PREFIX=${placeholder ''out''}" + "PREFIX=${placeholder "out"}" ]; postPatch = '' diff --git a/nixpkgs/pkgs/desktops/deepin/deepin-desktop-schemas/default.nix b/nixpkgs/pkgs/desktops/deepin/deepin-desktop-schemas/default.nix index b6c20ef71297..4f2427e8237a 100644 --- a/nixpkgs/pkgs/desktops/deepin/deepin-desktop-schemas/default.nix +++ b/nixpkgs/pkgs/desktops/deepin/deepin-desktop-schemas/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { # fix default background url sed -i -e 's,/usr/share/backgrounds/default_background.jpg,/usr/share/backgrounds/deepin/desktop.jpg,' \ overrides/common/com.deepin.wrap.gnome.desktop.override - + fixPath ${deepin-wallpapers} /usr/share/backgrounds \ overrides/common/com.deepin.wrap.gnome.desktop.override @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { # /usr/share/desktop-directories ''; - makeFlags = [ "PREFIX=${placeholder ''out''}" ]; + makeFlags = [ "PREFIX=${placeholder "out"}" ]; doCheck = true; checkTarget = "test"; diff --git a/nixpkgs/pkgs/desktops/deepin/deepin-gettext-tools/default.nix b/nixpkgs/pkgs/desktops/deepin/deepin-gettext-tools/default.nix index f4f4ae2971a4..67fcc36bcefc 100644 --- a/nixpkgs/pkgs/desktops/deepin/deepin-gettext-tools/default.nix +++ b/nixpkgs/pkgs/desktops/deepin/deepin-gettext-tools/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { python3Packages.python ]; - makeFlags = [ "PREFIX=${placeholder ''out''}" ]; + makeFlags = [ "PREFIX=${placeholder "out"}" ]; postPatch = '' sed -e 's/sudo cp/cp/' -i src/generate_mo.py diff --git a/nixpkgs/pkgs/desktops/deepin/deepin-gtk-theme/default.nix b/nixpkgs/pkgs/desktops/deepin/deepin-gtk-theme/default.nix index 4c0643a7ce5c..8e2469a2c788 100644 --- a/nixpkgs/pkgs/desktops/deepin/deepin-gtk-theme/default.nix +++ b/nixpkgs/pkgs/desktops/deepin/deepin-gtk-theme/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { propagatedUserEnvPkgs = [ gtk-engine-murrine ]; - makeFlags = [ "PREFIX=${placeholder ''out''}" ]; + makeFlags = [ "PREFIX=${placeholder "out"}" ]; passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; diff --git a/nixpkgs/pkgs/desktops/deepin/deepin-icon-theme/default.nix b/nixpkgs/pkgs/desktops/deepin/deepin-icon-theme/default.nix index 8ecb25f5a2e7..e63a228d0cbe 100644 --- a/nixpkgs/pkgs/desktops/deepin/deepin-icon-theme/default.nix +++ b/nixpkgs/pkgs/desktops/deepin/deepin-icon-theme/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { buildTargets = "all hicolor-links"; installTargets = "install-icons install-cursors"; - installFlags = [ "PREFIX=${placeholder ''out''}" ]; + installFlags = [ "PREFIX=${placeholder "out"}" ]; postInstall = '' cp -a ./Sea ./usr/share/icons/hicolor "$out"/share/icons/ diff --git a/nixpkgs/pkgs/desktops/deepin/deepin-sound-theme/default.nix b/nixpkgs/pkgs/desktops/deepin/deepin-sound-theme/default.nix index 398be55398bf..e61e91fc87c7 100644 --- a/nixpkgs/pkgs/desktops/deepin/deepin-sound-theme/default.nix +++ b/nixpkgs/pkgs/desktops/deepin/deepin-sound-theme/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1sw4nrn7q7wk1hpicm05apyc0mihaw42iqm52wb8ib8gm1qiylr9"; }; - makeFlags = [ "PREFIX=${placeholder ''out''}" ]; + makeFlags = [ "PREFIX=${placeholder "out"}" ]; passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; diff --git a/nixpkgs/pkgs/desktops/deepin/go-dbus-factory/default.nix b/nixpkgs/pkgs/desktops/deepin/go-dbus-factory/default.nix index 1d97991dffd0..d302cc3417f2 100644 --- a/nixpkgs/pkgs/desktops/deepin/go-dbus-factory/default.nix +++ b/nixpkgs/pkgs/desktops/deepin/go-dbus-factory/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "06fqyad9f50gcjsjkh7929yyaprahdjhnd0dr4gl2797a7wysl3f"; }; - makeFlags = [ "PREFIX=${placeholder ''out''}" ]; + makeFlags = [ "PREFIX=${placeholder "out"}" ]; postPatch = '' sed -i -e 's:/share/gocode:/share/go:' Makefile diff --git a/nixpkgs/pkgs/desktops/deepin/go-dbus-generator/default.nix b/nixpkgs/pkgs/desktops/deepin/go-dbus-generator/default.nix index 2c63fd5ebe62..125629764902 100644 --- a/nixpkgs/pkgs/desktops/deepin/go-dbus-generator/default.nix +++ b/nixpkgs/pkgs/desktops/deepin/go-dbus-generator/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ]; makeFlags = [ - "PREFIX=${placeholder ''out''}" + "PREFIX=${placeholder "out"}" "GOCACHE=$(TMPDIR)/go-cache" ]; diff --git a/nixpkgs/pkgs/desktops/deepin/go-gir-generator/default.nix b/nixpkgs/pkgs/desktops/deepin/go-gir-generator/default.nix index 68504d756b17..2f431bd941b8 100644 --- a/nixpkgs/pkgs/desktops/deepin/go-gir-generator/default.nix +++ b/nixpkgs/pkgs/desktops/deepin/go-gir-generator/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ''; makeFlags = [ - "PREFIX=${placeholder ''out''}" + "PREFIX=${placeholder "out"}" "GOCACHE=$(TMPDIR)/go-cache" ]; diff --git a/nixpkgs/pkgs/desktops/deepin/qt5dxcb-plugin/default.nix b/nixpkgs/pkgs/desktops/deepin/qt5dxcb-plugin/default.nix index d76bed1b9b7b..4d0240c426ba 100644 --- a/nixpkgs/pkgs/desktops/deepin/qt5dxcb-plugin/default.nix +++ b/nixpkgs/pkgs/desktops/deepin/qt5dxcb-plugin/default.nix @@ -25,7 +25,7 @@ mkDerivation rec { ]; qmakeFlags = [ - "INSTALL_PATH=${placeholder ''out''}/${qtbase.qtPluginPrefix}/platforms" + "INSTALL_PATH=${placeholder "out"}/${qtbase.qtPluginPrefix}/platforms" ]; enableParallelBuilding = true; |